Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lomiri.morph-browser: init at 1.1.0 #262433

Merged
merged 4 commits into from
Feb 22, 2024

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Oct 21, 2023

Description of changes

Working towards #99090.

Morph Browser is the Lomiri web browser. Last time I checked, neither Firefox nor Chrome work under Lomiri (Wayland), so this might be necessary for everyday use.

image

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@OPNA2608

This comment was marked as resolved.

@OPNA2608 OPNA2608 force-pushed the init/lomiri/morph-browser branch 2 times, most recently from 03cacc0 to 76b0512 Compare January 23, 2024 01:39
@OPNA2608

This comment was marked as resolved.

@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Jan 23, 2024

For getting proper graphics in testing (normally Lomiri / its NixOS module would set this up):

env UITK_ICON_THEME=suru XDG_DATA_DIRS="$(nix-build --no-out-link . -A lomiri.suru-icon-theme)"/share:$XDG_DATA_DIRS "$(nix-build --no-out-link . -A lomiri.morph-browser)"/bin/morph-browser

Edit: I also added a VM test to check that the browser

  • launches
  • displays content
  • applies requested localisation

@OPNA2608 OPNA2608 marked this pull request as ready for review January 23, 2024 17:44
@OPNA2608 OPNA2608 changed the title lomiri.morph-browser: init at 1.0.3 lomiri.morph-browser: init at 1.1.0 Jan 28, 2024
@OPNA2608
Copy link
Contributor Author

Ping @SuperSandro2000, anything else?

@pbsds
Copy link
Member

pbsds commented Feb 21, 2024

I'm getting a timeout on the nixosTest when merged onto master

@OPNA2608
Copy link
Contributor Author

Seems to be an issue with the latest imagemagick bump (#288208), bisected within the nixpkgs-review shell.

git bisect start
# Status: warte auf guten und schlechten Commit
# bad: [6c8d5bb7169c8bad0a5c203279524df1e7c673e6] morph-browser
git bisect bad 6c8d5bb7169c8bad0a5c203279524df1e7c673e6
# Status: warte auf gute(n) Commit(s), schlechter Commit bekannt
# good: [fbe2d5c2852179db37f7a6af92052309fad7b5ea] Merge pull request #285120 from OPNA2608/fix/lomiri-ui-toolkit-versioned-QML_IMPORTS_PATH
git bisect good fbe2d5c2852179db37f7a6af92052309fad7b5ea
# good: [e9b728e4fdbd2efee1eebad2e6e591b253e7b2f8] Merge pull request #284580 from D3vil0p3r/patch-5
git bisect good e9b728e4fdbd2efee1eebad2e6e591b253e7b2f8
# bad: [60abd7c1f985d0679675ec860024e7fa16f229ee] Merge pull request #288138 from ambroisie/tandoor-recipes-manage-script
git bisect bad 60abd7c1f985d0679675ec860024e7fa16f229ee
# bad: [db19b2874696e9d0adbd0078735831eab7b51c01] Merge pull request #285249 from GaetanLepage/torch
git bisect bad db19b2874696e9d0adbd0078735831eab7b51c01
# good: [b8a84834b23cc1edd649e9921bf7d5f5d9b4118d] Merge pull request #287766 from bobby285271/upd/gnome
git bisect good b8a84834b23cc1edd649e9921bf7d5f5d9b4118d
# good: [f7152e2e18a80a61e507c4be485ca1289dc8cffd] Merge pull request #287924 from wegank/msolve-bump
git bisect good f7152e2e18a80a61e507c4be485ca1289dc8cffd
# good: [113bb026d5d3d873a2c52787e26af10ebb5f30b0] Merge pull request #286850 from khaneliman/sketchybar
git bisect good 113bb026d5d3d873a2c52787e26af10ebb5f30b0
# bad: [88e66deef19b2b920a4bae96a9a7cb5f4eafb9a9] Merge pull request #287572 from trofi/invoiceplane-fix-hash
git bisect bad 88e66deef19b2b920a4bae96a9a7cb5f4eafb9a9
# bad: [a9ec8d4aa34ad005597cf8e67018c1112c0926e7] Merge pull request #287862 from D3vil0p3r/patch-12
git bisect bad a9ec8d4aa34ad005597cf8e67018c1112c0926e7
# good: [b54cebbc14d59a8768a878ccd0e0f0deaff099da] Merge pull request #286580 from SuperSamus/wine-update
git bisect good b54cebbc14d59a8768a878ccd0e0f0deaff099da
# bad: [36ab9337c0f92b09ce06146b2fd4f3b061780b77] Merge pull request #288208 from r-ryantm/auto-update/imagemagick
git bisect bad 36ab9337c0f92b09ce06146b2fd4f3b061780b77
# good: [2e26817d1275a81fed48318e4b26eb0739f0340c] Merge pull request #284707 from ocfox/tide
git bisect good 2e26817d1275a81fed48318e4b26eb0739f0340c
# good: [e03ad4b2f916504bcedeff945486d119ff71c2ea] Merge pull request #288213 from dotlambda/stem-1.8.3
git bisect good e03ad4b2f916504bcedeff945486d119ff71c2ea
# bad: [6a79a442b49967fd8ccae8eeb9f03a066d74eac4] imagemagick: 7.1.1-27 -> 7.1.1-28
git bisect bad 6a79a442b49967fd8ccae8eeb9f03a066d74eac4
# first bad commit: [6a79a442b49967fd8ccae8eeb9f03a066d74eac4] imagemagick: 7.1.1-27 -> 7.1.1-28

I can confirm via reverting some commits that #289264 had to disable some of its OCR tests due to degraded text recognition with this new version, and that their old tests work fine on the previous version. I'll also adjust the OCR part of the tests here.

(Not sure if this is worth escalating to an issue, prolly just a part of dealing with the OCR's moodiness. Just wanted to mention the path I took for figuring this out.)

@OPNA2608

This comment was marked as resolved.

@OPNA2608 OPNA2608 marked this pull request as draft February 21, 2024 22:29
@OPNA2608
Copy link
Contributor Author

I added various UI strings to look for, I hope it's more reliable now.

@OPNA2608 OPNA2608 marked this pull request as ready for review February 22, 2024 10:16
Copy link
Member

@pbsds pbsds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Runs fine, and the derivation and desktop files LGTM

@pbsds pbsds merged commit b775c02 into NixOS:master Feb 22, 2024
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants