Set merge + mkIf always surprises me

+7 -4
+2 -2
nixos/modules/programs/shadow.nix
··· 106 chfn.source = "${pkgs.shadow.out}/bin/chfn"; 107 newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap"; 108 newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap"; 109 - } // (lib.mkIf config.users.mutableUsers { 110 passwd.source = "${pkgs.shadow.out}/bin/passwd"; 111 sg.source = "${pkgs.shadow.out}/bin/sg"; 112 newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; 113 - }); 114 }; 115 }
··· 106 chfn.source = "${pkgs.shadow.out}/bin/chfn"; 107 newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap"; 108 newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap"; 109 + } // (if config.users.mutableUsers then { 110 passwd.source = "${pkgs.shadow.out}/bin/passwd"; 111 sg.source = "${pkgs.shadow.out}/bin/sg"; 112 newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; 113 + } else {}); 114 }; 115 }
+2 -2
nixos/modules/security/pam.nix
··· 478 owner = "root"; 479 setuid = true; 480 }; 481 - } // (mkIf config.security.pam.enableEcryptfs { 482 "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; 483 "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; 484 - }); 485 486 environment.etc = 487 mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
··· 478 owner = "root"; 479 setuid = true; 480 }; 481 + } // (if config.security.pam.enableEcryptfs then { 482 "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; 483 "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; 484 + } else {}); 485 486 environment.etc = 487 mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
+3
nixos/modules/security/wrappers/default.nix
··· 152 153 ###### implementation 154 config = { 155 # Make sure our wrapperDir exports to the PATH env variable when 156 # initializing the shell 157 environment.extraInit = ''
··· 152 153 ###### implementation 154 config = { 155 + 156 + security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount"; 157 + 158 # Make sure our wrapperDir exports to the PATH env variable when 159 # initializing the shell 160 environment.extraInit = ''