Skip to content

lomiri.lomiri-system-settings{,-unwrapped,-security-privacy}: init at 1.0.2#278374

Merged
pbsds merged 4 commits intoNixOS:masterfrom
OPNA2608:init/lomiri/lomiri-system-settings
Feb 26, 2024
Merged

lomiri.lomiri-system-settings{,-unwrapped,-security-privacy}: init at 1.0.2#278374
pbsds merged 4 commits intoNixOS:masterfrom
OPNA2608:init/lomiri/lomiri-system-settings

Conversation

@OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Jan 2, 2024

Description of changes

Working towards #99090.

Lomiri System Settings is the main settings app for Lomiri. It's also one of the more integral parts of the lomiri shell & experience:

  • It's a dependency for building it
  • Some of the Ayatana indicators Lomiri displays have buttons that dispatch URL requests into the settings page
  • Lomiri's first-time-wizard uses some of its QML modules in its setup pages
    • I don't think we'll keep the wizard enabled in our packaging, since it can't really configure much with the way NixOS works, but it's good to keep in mind that its QML modules get used in other places
  • It's also one of the more convenient ways of graphically checking if URL dispatches (session indicator has a button that dispatches into it) and content-hub exchanges (wallpaper page lets you ask other applications for images) work as they should.

Bildschirmfoto von 2024-01-02 23 08 22

If my overview of dependencies isn't super off, then this should be one of the last big dependencies (if not the last big dependency) needed for building the lomiri shell.


I've submitted everything that I think is good to have for everyone upstream, but some things remain on our end:

  1. Replacing the dependency on lomiri-keyboard with maliit-keyboard. I have so far been unable to get either of them working, but maliit-keyboard saves us a dependency. Debian is also patching this to maliit-keyboard, and lomiri-keyboard might get replaced by maliit-keyboard, so this seems fine to me.
  2. There is an assumption that all plugins store their data under the same shared prefix - this affects plugin finding, loading, and localisation. I'm solving this via an envvar that points at the prefix to use, and a wrapper that symlinks files together & sets the envvar.

To ensure that everything works, I have packaged one of the external plugins (security-privacy) and added a VM test that:

  • carefully checks that all pages for internal & wrapped external plugins don't crash & display the expected content, to check if the general wrapping is correct
  • verifies that localisation is properly covered by the patch

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jan 2, 2024
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 3, 2024
@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch from a62e656 to 73390fc Compare January 24, 2024 01:15
@github-actions github-actions bot removed the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jan 24, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Jan 24, 2024
@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch from 73390fc to ba16847 Compare January 30, 2024 14:27
@OPNA2608

This comment was marked as outdated.

@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch from ba16847 to 55aab20 Compare February 8, 2024 22:44
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Feb 8, 2024
@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch from 55aab20 to 2c03c50 Compare February 9, 2024 19:04
@ofborg ofborg bot removed the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Feb 12, 2024
@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch 2 times, most recently from e393284 to 4d15821 Compare February 14, 2024 19:10
@OPNA2608 OPNA2608 marked this pull request as ready for review February 14, 2024 21:10
@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch from 4d15821 to 860d8ef Compare February 15, 2024 08:59
@OPNA2608 OPNA2608 changed the title lomiri.lomiri-system-settings: init at 1.0.2 lomiri.lomiri-system-settings{,-unwrapped,-security-privacy}: init at 1.0.2 Feb 15, 2024
@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch 2 times, most recently from d0f12b6 to 4308ac4 Compare February 24, 2024 12:32
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.

whoops, didn't submit the review. I must've been working on it when my laptop died on the train.

Result of nixpkgs-review pr 278374 run on x86_64-linux 1

4 packages built:
  • lomiri.lomiri-system-settings
  • lomiri.lomiri-system-settings-security-privacy
  • lomiri.lomiri-system-settings-unwrapped
  • lomiri.lomiri-system-settings-unwrapped.dev

nixos test passes locally 👍

@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch from 4308ac4 to 50d2894 Compare February 25, 2024 11:53
@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch from 50d2894 to bf4d92b Compare February 25, 2024 12:14
@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch 2 times, most recently from 946a583 to f277fb9 Compare February 25, 2024 13:47
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.

LGTM, what do you think @wineee?

@OPNA2608 OPNA2608 force-pushed the init/lomiri/lomiri-system-settings branch from f277fb9 to 66129d5 Compare February 26, 2024 09:12
@pbsds pbsds merged commit 9f6ae93 into NixOS:master Feb 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: package (new) This PR adds a new package 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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments