commit ff227057931f5977352f7583b00f9d1f8cf43da5 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/network-filesystems/openafs-client/default.nix

···

       80
        
             preStart = ''

     

       81
        
               mkdir -p -m 0755 /afs

     

       82
        
               mkdir -m 0700 -p ${cfg.cacheDirectory}

     

       83
       -
               ${pkgs.kmod}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true

     

       84
        
               ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb

     

       85
        
               ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"}

     

       86
        
             '';

···

       80
        
             preStart = ''

     

       81
        
               mkdir -p -m 0755 /afs

     

       82
        
               mkdir -m 0700 -p ${cfg.cacheDirectory}

     

       83
       +
               ${pkgs.kmod}/bin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true

     

       84
        
               ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb

     

       85
        
               ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"}

     

       86
        
             '';

+13 -13

nixos/modules/virtualisation/qemu-vm.nix

···

       135
        
               }

     

       136
        
               ''

     

       137
        
                 # Create a /boot EFI partition with 40M

     

       138
       -
                 ${pkgs.gptfdisk}/sbin/sgdisk -G /dev/vda

     

       139
       -
                 ${pkgs.gptfdisk}/sbin/sgdisk -a 1 -n 1:34:2047 -c 1:"BIOS Boot Partition" -t 1:ef02 /dev/vda

     

       140
       -
                 ${pkgs.gptfdisk}/sbin/sgdisk -a 512 -N 2 -c 2:"EFI System" -t 2:ef00 /dev/vda

     

       141
       -
                 ${pkgs.gptfdisk}/sbin/sgdisk -A 1:set:1 /dev/vda

     

       142
       -
                 ${pkgs.gptfdisk}/sbin/sgdisk -A 2:set:2 /dev/vda

     

       143
       -
                 ${pkgs.gptfdisk}/sbin/sgdisk -h 2 /dev/vda

     

       144
       -
                 ${pkgs.gptfdisk}/sbin/sgdisk -C /dev/vda

     

       145
        
                 ${pkgs.utillinux}/bin/sfdisk /dev/vda -A 2

     

       146
        
                 . /sys/class/block/vda2/uevent

     

       147
        
                 mknod /dev/vda2 b $MAJOR $MINOR

     
···

       151
        
                 ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot

     

       152
        
       

     

       153
        
                 # Mount /boot; load necessary modules first.

     

       154
       -
                 ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true

     

       155
       -
                 ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true

     

       156
       -
                 ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true

     

       157
       -
                 ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true

     

       158
       -
                 ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true

     

       159
        
                 mkdir /boot

     

       160
        
                 mount /dev/vda2 /boot

     

       161
        
       

     
···

       370
        
           boot.initrd.extraUtilsCommands =

     

       371
        
             ''

     

       372
        
               # We need mke2fs in the initrd.

     

       373
       -
               copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/mke2fs

     

       374
        
             '';

     

       375
        
       

     

       376
        
           boot.initrd.postDeviceCommands =

···

       135
        
               }

     

       136
        
               ''

     

       137
        
                 # Create a /boot EFI partition with 40M

     

       138
       +
                 ${pkgs.gptfdisk}/bin/sgdisk -G /dev/vda

     

       139
       +
                 ${pkgs.gptfdisk}/bin/sgdisk -a 1 -n 1:34:2047 -c 1:"BIOS Boot Partition" -t 1:ef02 /dev/vda

     

       140
       +
                 ${pkgs.gptfdisk}/bin/sgdisk -a 512 -N 2 -c 2:"EFI System" -t 2:ef00 /dev/vda

     

       141
       +
                 ${pkgs.gptfdisk}/bin/sgdisk -A 1:set:1 /dev/vda

     

       142
       +
                 ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda

     

       143
       +
                 ${pkgs.gptfdisk}/bin/sgdisk -h 2 /dev/vda

     

       144
       +
                 ${pkgs.gptfdisk}/bin/sgdisk -C /dev/vda

     

       145
        
                 ${pkgs.utillinux}/bin/sfdisk /dev/vda -A 2

     

       146
        
                 . /sys/class/block/vda2/uevent

     

       147
        
                 mknod /dev/vda2 b $MAJOR $MINOR

     
···

       151
        
                 ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot

     

       152
        
       

     

       153
        
                 # Mount /boot; load necessary modules first.

     

       154
       +
                 ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true

     

       155
       +
                 ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true

     

       156
       +
                 ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true

     

       157
       +
                 ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true

     

       158
       +
                 ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true

     

       159
        
                 mkdir /boot

     

       160
        
                 mount /dev/vda2 /boot

     

       161
        
       

     
···

       370
        
           boot.initrd.extraUtilsCommands =

     

       371
        
             ''

     

       372
        
               # We need mke2fs in the initrd.

     

       373
       +
               copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs

     

       374
        
             '';

     

       375
        
       

     

       376
        
           boot.initrd.postDeviceCommands =

+1 -1

pkgs/development/tools/misc/lttng-tools/default.nix

···

       11
        
         buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ];

     

       12
        
       

     

       13
        
         prePatch = ''

     

       14
       -
           sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \

     

       15
        
               -i src/bin/lttng-sessiond/modprobe.c

     

       16
        
         '';

     

       17

···

       11
        
         buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ];

     

       12
        
       

     

       13
        
         prePatch = ''

     

       14
       +
           sed -e "s|/sbin/modprobe|${kmod}/bin/modprobe|g" \

     

       15
        
               -i src/bin/lttng-sessiond/modprobe.c

     

       16
        
         '';

     

       17

+2 -2

pkgs/os-specific/linux/kernel/manual-config.nix

···

       93
        
                   echo "stripping FHS paths in \`$mf'..."

     

       94
        
                   sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g'

     

       95
        
               done

     

       96
       -
               sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|'

     

       97
        
             '';

     

       98
        
       

     

       99
        
             configurePhase = ''

     
···

       188
        
               find -empty -type d -delete

     

       189
        
       

     

       190
        
               # Remove reference to kmod

     

       191
       -
               sed -i Makefile -e 's|= ${kmod}/sbin/depmod|= depmod|'

     

       192
        
             '' else optionalString installsFirmware ''

     

       193
        
               make firmware_install $makeFlags "''${makeFlagsArray[@]}" \

     

       194
        
                 $installFlags "''${installFlagsArray[@]}"

···

       93
        
                   echo "stripping FHS paths in \`$mf'..."

     

       94
        
                   sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g'

     

       95
        
               done

     

       96
       +
               sed -i Makefile -e 's|= depmod|= ${kmod}/bin/depmod|'

     

       97
        
             '';

     

       98
        
       

     

       99
        
             configurePhase = ''

     
···

       188
        
               find -empty -type d -delete

     

       189
        
       

     

       190
        
               # Remove reference to kmod

     

       191
       +
               sed -i Makefile -e 's|= ${kmod}/bin/depmod|= depmod|'

     

       192
        
             '' else optionalString installsFirmware ''

     

       193
        
               make firmware_install $makeFlags "''${makeFlagsArray[@]}" \

     

       194
        
                 $installFlags "''${installFlagsArray[@]}"

+1 -1

pkgs/os-specific/linux/kmod/aggregator.nix

···

       21
        
             # kernel version number, otherwise depmod will use `uname -r'.

     

       22
        
             if test -w $out/lib/modules/$kernelVersion; then

     

       23
        
                 rm -f $out/lib/modules/$kernelVersion/modules.*

     

       24
       -
                 ${kmod}/sbin/depmod -b $out -a $kernelVersion

     

       25
        
             fi

     

       26
        
           '';

     

       27
        
       }

···

       21
        
             # kernel version number, otherwise depmod will use `uname -r'.

     

       22
        
             if test -w $out/lib/modules/$kernelVersion; then

     

       23
        
                 rm -f $out/lib/modules/$kernelVersion/modules.*

     

       24
       +
                 ${kmod}/bin/depmod -b $out -a $kernelVersion

     

       25
        
             fi

     

       26
        
           '';

     

       27
        
       }

+1 -1

pkgs/tools/networking/network-manager/default.nix

···

       19
        
           substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname

     

       20
        
           substituteInPlace configure --replace /usr/bin/file ${file}/bin/file

     

       21
        
           substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping

     

       22
       -
           substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe

     

       23
        
           substituteInPlace data/84-nm-drivers.rules \

     

       24
        
             --replace /bin/sh ${stdenv.shell}

     

       25
        
           substituteInPlace data/85-nm-unmanaged.rules \

···

       19
        
           substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname

     

       20
        
           substituteInPlace configure --replace /usr/bin/file ${file}/bin/file

     

       21
        
           substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping

     

       22
       +
           substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/bin/modprobe

     

       23
        
           substituteInPlace data/84-nm-drivers.rules \

     

       24
        
             --replace /bin/sh ${stdenv.shell}

     

       25
        
           substituteInPlace data/85-nm-unmanaged.rules \

+3 -3

pkgs/tools/networking/network-manager/openconnect.nix

···

       23
        
       

     

       24
        
         preConfigure = ''

     

       25
        
            substituteInPlace "configure" \

     

       26
       -
              --replace "/sbin/sysctl" "${procps}/sbin/sysctl"

     

       27
        
            substituteInPlace "src/nm-openconnect-service.c" \

     

       28
       -
              --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \

     

       29
       -
              --replace "/sbin/modprobe" "${kmod}/sbin/modprobe"

     

       30
        
         '';

     

       31
        
       

     

       32
        
         meta = {

···

       23
        
       

     

       24
        
         preConfigure = ''

     

       25
        
            substituteInPlace "configure" \

     

       26
       +
              --replace "/sbin/sysctl" "${procps}/bin/sysctl"

     

       27
        
            substituteInPlace "src/nm-openconnect-service.c" \

     

       28
       +
              --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \

     

       29
       +
              --replace "/sbin/modprobe" "${kmod}/bin/modprobe"

     

       30
        
         '';

     

       31
        
       

     

       32
        
         meta = {

+3 -3

pkgs/tools/networking/network-manager/openvpn.nix

···

       27
        
            substituteInPlace "configure" \

     

       28
        
              --replace "/sbin/sysctl" "${procps}/sbin/sysctl"

     

       29
        
            substituteInPlace "src/nm-openvpn-service.c" \

     

       30
       -
              --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" \

     

       31
       -
              --replace "/sbin/modprobe" "${kmod}/sbin/modprobe"

     

       32
        
            substituteInPlace "properties/auth-helpers.c" \

     

       33
       -
              --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn"

     

       34
        
         '';

     

       35
        
       

     

       36
        
         meta = {

···

       27
        
            substituteInPlace "configure" \

     

       28
        
              --replace "/sbin/sysctl" "${procps}/sbin/sysctl"

     

       29
        
            substituteInPlace "src/nm-openvpn-service.c" \

     

       30
       +
              --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" \

     

       31
       +
              --replace "/sbin/modprobe" "${kmod}/bin/modprobe"

     

       32
        
            substituteInPlace "properties/auth-helpers.c" \

     

       33
       +
              --replace "/sbin/openvpn" "${openvpn}/bin/openvpn"

     

       34
        
         '';

     

       35
        
       

     

       36
        
         meta = {

+3 -3

pkgs/tools/networking/network-manager/vpnc.nix

···

       24
        
       

     

       25
        
         preConfigure = ''

     

       26
        
            substituteInPlace "configure" \

     

       27
       -
              --replace "/sbin/sysctl" "${procps}/sbin/sysctl"

     

       28
        
            substituteInPlace "src/nm-vpnc-service.c" \

     

       29
       -
              --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \

     

       30
       -
              --replace "/sbin/modprobe" "${kmod}/sbin/modprobe"

     

       31
        
         '';

     

       32
        
       

     

       33
        
         meta = {

···

       24
        
       

     

       25
        
         preConfigure = ''

     

       26
        
            substituteInPlace "configure" \

     

       27
       +
              --replace "/sbin/sysctl" "${procps}/bin/sysctl"

     

       28
        
            substituteInPlace "src/nm-vpnc-service.c" \

     

       29
       +
              --replace "/sbin/vpnc" "${vpnc}/bin/vpnc" \

     

       30
       +
              --replace "/sbin/modprobe" "${kmod}/bin/modprobe"

     

       31
        
         '';

     

       32
        
       

     

       33
        
         meta = {