dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Set merge + mkIf always surprises me

Browse Source
This commit is contained in:
Parnell Springmeyer 2017-01-29 17:10:32 -06:00
parent f2f3f1479e
commit 264db4e309
No known key found for this signature in database
GPG Key ID: DCCF89258EAD874A
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/shadow.nix
View File

@ -106,10 +106,10 @@ in
chfn.source = "${pkgs.shadow.out}/bin/chfn"; chfn.source = "${pkgs.shadow.out}/bin/chfn";
newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap"; newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";
newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap"; newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";
} // (lib.mkIf config.users.mutableUsers { } // (if config.users.mutableUsers then {
passwd.source = "${pkgs.shadow.out}/bin/passwd"; passwd.source = "${pkgs.shadow.out}/bin/passwd";
sg.source = "${pkgs.shadow.out}/bin/sg"; sg.source = "${pkgs.shadow.out}/bin/sg";
newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; newgrp.source = "${pkgs.shadow.out}/bin/newgrp";
}); } else {});
}; };
} }

4
nixos/modules/security/pam.nix
View File

@ -478,10 +478,10 @@ in
owner = "root"; owner = "root";
setuid = true; setuid = true;
}; };
} // (mkIf config.security.pam.enableEcryptfs { } // (if config.security.pam.enableEcryptfs then {
"mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
"umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
}); } else {});
environment.etc = environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services; mapAttrsToList (n: v: makePAMService v) config.security.pam.services;

3
nixos/modules/security/wrappers/default.nix
View File

@ -152,6 +152,9 @@ in
###### implementation ###### implementation
config = { config = {
security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount";
# Make sure our wrapperDir exports to the PATH env variable when # Make sure our wrapperDir exports to the PATH env variable when
# initializing the shell # initializing the shell
environment.extraInit = '' environment.extraInit = ''