-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
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
Fixups after new security wrapper #22806
Fixups after new security wrapper #22806
Conversation
ecd1c35
to
c59cdba
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @bjornfor!
@@ -32,6 +32,9 @@ with lib; | |||
|
|||
(mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ]) | |||
|
|||
(mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I totally missed this, thanks!
@@ -1,7 +1,7 @@ | |||
{ config, lib, pkgs, ... }: | |||
let | |||
|
|||
inherit (config.security) wrapperDir wrappers setuidPrograms; | |||
inherit (config.security) wrapperDir wrappers; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
The option doesn't exist anymore.
The new option takes an attrset, not a list.
Let users know about the option rename / change during nixos-rebuild with a useful message instead of an error (with no way forward).
c59cdba
to
b1bfe9d
Compare
Motivation for this change
Needed to unbreak NixOS master branch.
Things done
WARNING: Not fully tested yet. Still building...
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)