Fixups after new security wrapper #22806
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bjornfor
force-pushed
the
fixups-after-new-security-wrapper
branch
2 times, most recently
from
ecd1c35
to
c59cdba
Compare
fpletz
approved these changes
Feb 14, 2017
7 tasks
ixmatus
reviewed
Feb 14, 2017
| @@ -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.
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; | |||
globin
approved these changes
Feb 15, 2017
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).
bjornfor
force-pushed
the
fixups-after-new-security-wrapper
branch
from
c59cdba
to
b1bfe9d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)