commit ff2117192105c4c356a6ce31514ca93da2e837ff · pyrox.dev/nixpkgs

+1 -1

nixos/modules/config/users-groups.nix

···

       110
       110
        
       

     

       111
       111
        
             shell = mkOption {

     

       112
       112
        
               type = types.str;

     

       113
       113
       -
               default = "/run/current-system/sw/sbin/nologin";

     

       113
       113
       +
               default = "/run/current-system/sw/bin/nologin";

     

       114
       114
        
               description = "The path to the user's shell.";

     

       115
       115
        
             };

     

       116
       116

+2 -2

nixos/modules/services/monitoring/munin.nix

···

       34
       34
        
               cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file)

     

       35
       35
        
       

     

       36
       36
        
               wrapProgram $file \

     

       37
       37
       -
                 --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" \

     

       37
       37
       +
                 --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \

     

       38
       38
        
                 --set MUNIN_LIBDIR "${pkgs.munin}/lib" \

     

       39
       39
        
                 --set MUNIN_PLUGSTATE "/var/run/munin"

     

       40
       40
        
       

     
···

       194
       194
        
       

     

       195
       195
        
               mkdir -p /etc/munin/plugins

     

       196
       196
        
               rm -rf /etc/munin/plugins/*

     

       197
       197
       -
               PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash

     

       197
       197
       +
               PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash

     

       198
       198
        
             '';

     

       199
       199
        
             serviceConfig = {

     

       200
       200
        
               ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/";

+1 -1

nixos/modules/services/network-filesystems/drbd.nix

···

       44
       44
        
       

     

       45
       45
        
           boot.extraModprobeConfig =

     

       46
       46
        
             ''

     

       47
       47
       -
               options drbd usermode_helper=/run/current-system/sw/sbin/drbdadm

     

       47
       47
       +
               options drbd usermode_helper=/run/current-system/sw/bin/drbdadm

     

       48
       48
        
             '';

     

       49
       49
        
       

     

       50
       50
        
           environment.etc = singleton

+1 -1

nixos/modules/services/x11/display-managers/lightdm.nix

···

       55
       55
        
             [UserList]

     

       56
       56
        
             minimum-uid=500

     

       57
       57
        
             hidden-users=${concatStringsSep " " dmcfg.hiddenUsers}

     

       58
       58
       -
             hidden-shells=/run/current-system/sw/sbin/nologin

     

       58
       58
       +
             hidden-shells=/run/current-system/sw/bin/nologin

     

       59
       59
        
           '';

     

       60
       60
        
       

     

       61
       61
        
         lightdmConf = writeText "lightdm.conf"

+1 -1

nixos/modules/services/x11/display-managers/sddm.nix

···

       26
       26
        
           [Users]

     

       27
       27
        
           MaximumUid=${toString config.ids.uids.nixbld}

     

       28
       28
        
           HideUsers=${concatStringsSep "," dmcfg.hiddenUsers}

     

       29
       29
       -
           HideShells=/run/current-system/sw/sbin/nologin

     

       29
       29
       +
           HideShells=/run/current-system/sw/bin/nologin

     

       30
       30
        
       

     

       31
       31
        
           [XDisplay]

     

       32
       32
        
           MinimumVT=${toString xcfg.tty}

+1 -1

pkgs/os-specific/linux/autofs/autofs-v5.nix

···

       17
       17
        
           configureFlags="--disable-move-mount --with-path=$PATH"

     

       18
       18
        
           export MOUNT=/var/run/current-system/sw/bin/mount

     

       19
       19
        
           export UMOUNT=/var/run/current-system/sw/bin/umount

     

       20
       20
       -
           export MODPROBE=/var/run/current-system/sw/sbin/modprobe

     

       20
       20
       +
           export MODPROBE=/var/run/current-system/sw/bin/modprobe

     

       21
       21
        
           # Grrr, rpcgen can't find cpp. (NIXPKGS-48)

     

       22
       22
        
           mkdir rpcgen

     

       23
       23
        
           echo "#! $shell" > rpcgen/rpcgen

+1 -1

pkgs/os-specific/linux/systemd/fixes.patch

···

       229
       229
        
        

     

       230
       230
        
       -        cmdline[i++] = "/sbin/fsck";

     

       231
       231
        
       -        cmdline[i++] =  arg_repair;

     

       232
       232
       -
       +        cmdline[i++] = "/run/current-system/sw/sbin/fsck";

     

       232
       232
       +
       +        cmdline[i++] = "/run/current-system/sw/bin/fsck";

     

       233
       233
        
                cmdline[i++] = "-T";

     

       234
       234
        
        

     

       235
       235
        
                /*

+1 -1

pkgs/os-specific/linux/udisks/1-default.nix

···

       23
       23
        
       

     

       24
       24
        
             substituteInPlace src/main.c --replace \

     

       25
       25
        
               "/sbin:/bin:/usr/sbin:/usr/bin" \

     

       26
       26
       -
               "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"

     

       26
       26
       +
               "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin"

     

       27
       27
        
           '';

     

       28
       28
        
       

     

       29
       29
        
         buildInputs =

+1 -1

pkgs/os-specific/linux/udisks/2-default.nix

···

       19
       19
        
           ''

     

       20
       20
        
             substituteInPlace src/main.c --replace \

     

       21
       21
        
               "@path@" \

     

       22
       22
       -
               "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"

     

       22
       22
       +
               "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin"

     

       23
       23
        
           '';

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pkgconfig intltool ];

+1 -1

pkgs/os-specific/linux/util-linux/default.nix

···

       34
       34
        
           --enable-mesg

     

       35
       35
        
           --enable-ddate

     

       36
       36
        
           --disable-use-tty-group

     

       37
       37
       -
           --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/sbin:/sbin

     

       37
       37
       +
           --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/bin:/sbin

     

       38
       38
        
           ${if ncurses == null then "--without-ncurses" else ""}

     

       39
       39
        
         '';

     

       40
       40

+1 -1

pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch

···

       16
       16
        
         # Ignore the prefix for the mount helper.  It must be installed in /sbin/

     

       17
       17
        
         # because this path is hardcoded in the mount(8) for security reasons.

     

       18
       18
        
       + #

     

       19
       19
       -
       + # ... except on nixos, where it really is /var/run/current-system/sw/sbin,

     

       19
       19
       +
       + # ... except on nixos, where it really is /var/run/current-system/sw/bin,

     

       20
       20
        
       + # which is where this will end up if we put it in ${out}/sbin.

     

       21
       21
        
         #

     

       22
       22
        
         sbin_PROGRAMS = mount.zfs

+1 -1

pkgs/servers/mail/postfix/default.nix

···

       18
       18
        
       

     

       19
       19
        
         postPatch = ''

     

       20
       20
        
           sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \

     

       21
       21
       -
             -e s,/usr/sbin,/var/run/current-system/sw/sbin, \

     

       21
       21
       +
             -e s,/usr/sbin,/var/run/current-system/sw/bin, \

     

       22
       22
        
             -e s,:/sbin,, src/util/sys_defs.h

     

       23
       23
        
         '';

     

       24
       24

+2 -2

pkgs/tools/networking/network-manager/nixos-purity.patch

···

       47
       47
        
        

     

       48
       48
        
        	for (iter = modules; *iter; iter++) {

     

       49
       49
        
       -		char *argv[3] = { "/sbin/modprobe", *iter, NULL };

     

       50
       50
       -
       +		char *argv[3] = { "/var/run/current-system/sw/sbin/modprobe", *iter, NULL };

     

       50
       50
       +
       +		char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL };

     

       51
       51
        
        		char *envp[1] = { NULL };

     

       52
       52
        
        		GError *error = NULL;

     

       53
       53
        
        

     
···

       71
       71
        
        	/* Make sure /dev/ppp exists (bgo #533064) */

     

       72
       72
        
        	if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))

     

       73
       73
        
       -		ignored = system ("/sbin/modprobe ppp_generic");

     

       74
       74
       -
       +		ignored = system ("/var/run/current-system/sw/sbin/modprobe ppp_generic");

     

       74
       74
       +
       +		ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic");

     

       75
       75
        
        

     

       76
       76
        
        	connection = nm_act_request_get_connection (req);

     

       77
       77
        
        	g_assert (connection);