Skip to content

[Backport release-25.05] nixos/lomiri: Exclude Morph Browser by default#439340

Closed
mdaniels5757 wants to merge 3 commits intoNixOS:release-25.05from
mdaniels5757:backport-436723-to-release-25.05
Closed

[Backport release-25.05] nixos/lomiri: Exclude Morph Browser by default#439340
mdaniels5757 wants to merge 3 commits intoNixOS:release-25.05from
mdaniels5757:backport-436723-to-release-25.05

Conversation

@mdaniels5757
Copy link
Member

Manual backport of #436723 to release-25.05.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

Qt5 qtwebengine will be marked insecure, so this would block the entire DE from being usable.
Epiphany seems to work as a replacement until Morph can be built with Qt6.

Content-Hub test will still need adjustment, but keeping it out of this to make future reverting easier.

(cherry picked from commit 5063462)
… using Gallery app instead

(cherry picked from commit 8ae6f58)
OfBorg please...

(cherry picked from commit f03a8ca)
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 18ed3bc and original 8ae6f58 may warrant inspection.

Show diff
@@ Metadata
  ## Commit message ##
     nixosTests.lomiri.desktop-appinteractions: Switch Content-Hub test to using Gallery app instead
 
+    (cherry picked from commit 8ae6f582ef7b2326f99e096fd56f551d1a66d00d)
+
  ## nixos/tests/lomiri.nix ##
 @@ nixos/tests/lomiri.nix: in
                machine.send_key("ret")
@@ nixos/tests/lomiri.nix: in
                machine.screenshot("settings_lomiri-content-hub_peers")
  
 -              # Select Morph as content source
--              mouse_click(340, 80)
+-              mouse_click(370, 100)
 +              # Select Gallery as content source
 +              mouse_click(460, 80)
  

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 4.workflow: backport This targets a stable branch labels Sep 1, 2025
@nix-owners nix-owners bot requested a review from OPNA2608 September 1, 2025 21:35
@mdaniels5757 mdaniels5757 marked this pull request as draft September 1, 2025 21:55
@mdaniels5757
Copy link
Member Author

nixosTests.lomiri fails/times out on x86_64-linux.

error: builder for '/nix/store/s6l87ll5jlq2jb8vg2p1rb68khybk48x-vm-test-run-lomiri-desktop-appinteractions.drv' failed with exit code 143;
       last 25 log lines:
       > machine # [  354.392704] lomiri-system-settings[1569]: file:///nix/store/sbqmi6890nz75dbqq0pqbjscg5775awa-lomiri-system-settings-1.3.2/shg
       > machine # [  354.395487] lomiri-system-settings[1569]: file:///nix/store/sbqmi6890nz75dbqq0pqbjscg5775awa-lomiri-system-settings-1.3.2/shg
       > machine # [  354.414889] lomiri-system-settings[1569]: file:///nix/store/sbqmi6890nz75dbqq0pqbjscg5775awa-lomiri-system-settings-1.3.2/sh}
       > machine # [  354.419542] lomiri-system-settings[1569]: /build/source/import/Lomiri/Content/contenttransfer.cpp 361 updateState void Conte4
       > machine # [  354.422316] lomiri-system-settings[1569]: /build/source/import/Lomiri/Content/contenttransfer.cpp 84 state ContentTransfer::t
       > machine # [  354.423706] lomiri-system-settings[1569]: /build/source/import/Lomiri/Content/contenttransfer.cpp 84 state ContentTransfer::t
       > machine # [  354.425107] lomiri-system-settings[1569]: /build/source/import/Lomiri/Content/contenttransfer.cpp 84 state ContentTransfer::t
       > machine # [  354.492820] lomiri-system-settings[1569]: /build/source/src/com/lomiri/content/detail/handler.cpp 58 HandleImport void com::"
       > machine # [  354.499212] lomiri-system-settings[1569]: /build/source/src/com/lomiri/content/detail/handler.cpp 61 HandleImport void com::4
       > machine # [  354.503304] lomiri-system-settings[1569]: /build/source/import/Lomiri/Content/contenttransfer.cpp 361 updateState void Conte4
       > machine # [  354.506046] lomiri-system-settings[1569]: /build/source/import/Lomiri/Content/contenttransfer.cpp 84 state ContentTransfer::t
       > machine # [  354.507627] lomiri-system-settings[1569]: /build/source/import/Lomiri/Content/contenttransfer.cpp 84 state ContentTransfer::t
       > machine # [  354.509152] lomiri-system-settings[1569]: /build/source/import/Lomiri/Content/contenttransfer.cpp 84 state ContentTransfer::t
       > machine # [  354.946607] lomiri-system-settings[1569]: /build/source/src/com/lomiri/content/hub.cpp 143 eventFilter virtual bool com::lomd
       > machine: (finished: must succeed: sleep 2, in 2.02 seconds)
       > machine: must succeed: sleep 30
       > machine: (finished: must succeed: sleep 30, in 30.02 seconds)
       > machine: waiting for Photos to appear on screen
       > machine # [  910.301464] systemd[1]: Starting Cleanup of Temporary Directories...
       > machine # [  910.411054] systemd[1]: systemd-tmpfiles-clean.service: Deactivated successfully.
       > machine # [  910.413358] systemd[1]: Finished Cleanup of Temporary Directories.
       > timeout reached; test terminating...
       > kill machine (pid 9)
       > qemu-system-x86_64: terminating on signal 15 from pid 6 (/nix/store/vxl8pzgkkw8vdb4agzwm58imrfclmfrx-python3-3.12.11/bin/python3.12)
       > Terminated

# Select Morph as content source
mouse_click(370, 100)
# Select Gallery as content source
mouse_click(460, 80)
Copy link
Contributor

Choose a reason for hiding this comment

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

Test is likely failing because this click is missing its target. Please figure out a working coordinate to put here, by launching the test interactively.

The coordinates need to be different here than on master because the version of Lomiri on the stable branch is lacking a commit that changes how the mouse tracks its position on the screen.

Copy link
Contributor

Choose a reason for hiding this comment

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

Submitted with fixed coords: #443158

@mdaniels5757
Copy link
Member Author

I don't think I can get this working in a timely manner: the test ends up quite flakey, sometimes for reasons seemingly related to my changes, sometimes not. Closing.

@mdaniels5757 mdaniels5757 deleted the backport-436723-to-release-25.05 branch September 13, 2025 00:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants