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

nixos/polkit: Add package option #322194

Merged
merged 1 commit into from
Jun 26, 2024
Merged

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Jun 24, 2024

For reviewers https://wiki.nixos.org/wiki/Nixpkgs/Reviewing_changes#Modules

security.polkit.package = pkgs.polkit.overrideAttrs (oldAttrs: {
  patches = oldAttrs.patches ++ [
    (pkgs.fetchpatch {
      url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/716a273ce0af467968057f3e107156182bd290b0.patch";
      sha256 = "sha256-hOJJhUmxXm87W1ZU9Y1NJ8GCyKvPjbIVtCHlhRGlN8k=";
    })
  ];
});

Overlaying polkit results in a lot of rebuilds thus it makes sense to add a package option.

Assists in using the patch needed to fix #18012

Description of changes

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.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

Overlaying polkit results in a lot of rebuilds thus it makes sense to
add a package option.

Assists in using the patch needed to fix https://www.github.com/NixOS/nixpkgs/issues/18012
@github-actions github-actions bot added 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/` labels Jun 24, 2024
@Artturin Artturin added the backport release-24.05 Backport PR automatically label Jun 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-10 labels Jun 24, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jun 24, 2024
@Artturin Artturin merged commit 1ecc3cd into NixOS:master Jun 26, 2024
31 checks passed
@Artturin Artturin deleted the polkitaddpackageoption branch June 26, 2024 09:42
Copy link
Contributor

Successfully created backport PR for release-24.05:

@Atemu
Copy link
Member

Atemu commented Jun 26, 2024

Haha, I was trying out this patch the other day and thought to myself that having a package option would have been helpful, thanks :)

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: 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 12.approvals: 1 This PR was reviewed and approved by one reputable person backport release-24.05 Backport PR automatically
Projects
None yet
5 participants