doas: add enablePAM option #94040
Merged
doas: add enablePAM option #94040
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
cole-h
requested changes
Oct 7, 2020
pkgs/tools/security/doas/default.nix
Outdated
| , enablePAM ? true | ||
|
|
There was a problem hiding this comment.
Keeping with the established style of the file:
Suggested change
| , enablePAM ? true | |
| , withPAM ? true |
pkgs/tools/security/doas/default.nix
Outdated
| @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { | |||
| configureFlags = [ | |||
| (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting | |||
| "--pamdir=${placeholder "out"}/etc/pam.d" | |||
| ]; | |||
| ] ++ lib.optional (!enablePAM) "--without-pam"; | |||
There was a problem hiding this comment.
I'd prefer this went inside the configureFlags list, just as withTimestamp above.
New option "withPAM" controls whether to build support for pluggable authetincation modules. Default value is "true", which correspond to existing behaviour. Futhermore, with default configuration, this change do not cause rebuild.
|
@cole-h Applied your suggestions. |
cole-h
approved these changes
Oct 9, 2020
| @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| configureFlags = [ | |||
| (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting | |||
| (lib.optionalString (!withPAM) "--without-pam") | |||
| "--pamdir=${placeholder "out"}/etc/pam.d" | |||
There was a problem hiding this comment.
Should we also gate this with lib.optionalString withPAM "..."?
There was a problem hiding this comment.
Well, upstream build system defaults to "--with-pam", so it is not strictly necessary.
|
Ofborg seems unhappy, but I don't understand why: |
|
@ofborg eval Master was broken a few times yesterday, causing this issue. |
ofborg
bot
added
10.rebuild-linux: 1-10
10.rebuild-linux: 1
and removed
10.rebuild-linux: 0
labels
cole-h
approved these changes
Oct 10, 2020
|
@cole-h Looks like everything is ready now. |
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.
New option "enablePAM" controls whether to build support for pluggable
authetincation modules. Default value is "true", which correspond to
existing behaviour. Futhermore, with default configuration, this change
do not cause rebuild.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)