commit 264db4e30936cbb4dd9f88123aafb42a5259e74f · pyrox.dev/nixpkgs

+2 -2

nixos/modules/programs/shadow.nix

···

       106
       106
        
             chfn.source      = "${pkgs.shadow.out}/bin/chfn";

     

       107
       107
        
             newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";

     

       108
       108
        
             newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";

     

       109
       109
       -
           } // (lib.mkIf config.users.mutableUsers {

     

       109
       109
       +
           } // (if config.users.mutableUsers then {

     

       110
       110
        
             passwd.source    = "${pkgs.shadow.out}/bin/passwd";

     

       111
       111
        
             sg.source        = "${pkgs.shadow.out}/bin/sg";

     

       112
       112
        
             newgrp.source    = "${pkgs.shadow.out}/bin/newgrp";

     

       113
       113
       -
           });

     

       113
       113
       +
           } else {});

     

       114
       114
        
         };

     

       115
       115
        
       }

+2 -2

nixos/modules/security/pam.nix

···

       478
       478
        
               owner = "root";

     

       479
       479
        
               setuid = true;

     

       480
       480
        
             };

     

       481
       481
       -
           } // (mkIf config.security.pam.enableEcryptfs {

     

       481
       481
       +
           } // (if config.security.pam.enableEcryptfs then {

     

       482
       482
        
             "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";

     

       483
       483
        
              "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";

     

       484
       484
       -
           });

     

       484
       484
       +
           } else {});

     

       485
       485
        
       

     

       486
       486
        
           environment.etc =

     

       487
       487
        
             mapAttrsToList (n: v: makePAMService v) config.security.pam.services;

+3

nixos/modules/security/wrappers/default.nix

···

       152
       152
        
       

     

       153
       153
        
         ###### implementation

     

       154
       154
        
         config = {

     

       155
       155
       +
       

     

       156
       156
       +
           security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount";

     

       157
       157
       +
       

     

       155
       158
        
           # Make sure our wrapperDir exports to the PATH env variable when

     

       156
       159
        
           # initializing the shell

     

       157
       160
        
           environment.extraInit = ''