commit 0d570e020e090c90701a52fac55ac3c6f3dbe1a2 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/installer/cd-dvd/sd-image-aarch64.nix

···

       5
       5
        
       let

     

       6
       6
        
         extlinux-conf-builder =

     

       7
       7
        
           import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {

     

       8
       8
       -
             pkgs = pkgs.buildPackages;

     

       8
       8
       +
             inherit pkgs;

     

       9
       9
        
           };

     

       10
       10
        
       in

     

       11
       11
        
       {

+1 -1

nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix

···

       5
       5
        
       let

     

       6
       6
        
         extlinux-conf-builder =

     

       7
       7
        
           import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {

     

       8
       8
       -
             pkgs = pkgs.buildPackages;

     

       8
       8
       +
             inherit pkgs;

     

       9
       9
        
           };

     

       10
       10
        
       in

     

       11
       11
        
       {

+1 -1

nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix

···

       5
       5
        
       let

     

       6
       6
        
         extlinux-conf-builder =

     

       7
       7
        
           import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {

     

       8
       8
       -
             pkgs = pkgs.buildPackages;

     

       8
       8
       +
             inherit pkgs;

     

       9
       9
        
           };

     

       10
       10
        
       in

     

       11
       11
        
       {

+2 -2

nixos/modules/system/boot/loader/generations-dir/generations-dir.nix

···

       7
       7
        
         generationsDirBuilder = pkgs.substituteAll {

     

       8
       8
        
           src = ./generations-dir-builder.sh;

     

       9
       9
        
           isExecutable = true;

     

       10
       10
       -
           inherit (pkgs.buildPackages) bash;

     

       11
       11
       -
           path = with pkgs.buildPackages; [coreutils gnused gnugrep];

     

       10
       10
       +
           inherit (pkgs) bash;

     

       11
       11
       +
           path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];

     

       12
       12
        
           inherit (config.boot.loader.generationsDir) copyKernels;

     

       13
       13
        
         };

     

       14
       14

+1 -1

nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix

···

       8
       8
        
       

     

       9
       9
        
         timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;

     

       10
       10
        
       

     

       11
       11
       -
         builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; };

     

       11
       11
       +
         builder = import ./extlinux-conf-builder.nix { inherit pkgs; };

     

       12
       12
        
       in

     

       13
       13
        
       {

     

       14
       14
        
         options = {

+2 -2

nixos/modules/system/boot/loader/init-script/init-script.nix

···

       7
       7
        
         initScriptBuilder = pkgs.substituteAll {

     

       8
       8
        
           src = ./init-script-builder.sh;

     

       9
       9
        
           isExecutable = true;

     

       10
       10
       -
           inherit (pkgs.buildPackages) bash;

     

       11
       11
       -
           path = with pkgs.buildPackages; [coreutils gnused gnugrep];

     

       10
       10
       +
           inherit (pkgs) bash;

     

       11
       11
       +
           path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
       in

+4 -3

nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix

···

       18
       18
        
       

     

       19
       19
        
         extlinuxConfBuilder =

     

       20
       20
        
           import ../generic-extlinux-compatible/extlinux-conf-builder.nix {

     

       21
       21
       -
             pkgs = pkgs.buildPackages;

     

       21
       21
       +
             inherit pkgs;

     

       22
       22
        
           };

     

       23
       23
        
       in

     

       24
       24
        
       pkgs.substituteAll {

     

       25
       25
        
         src = ./uboot-builder.sh;

     

       26
       26
        
         isExecutable = true;

     

       27
       27
       -
         inherit (pkgs.buildPackages) bash;

     

       28
       28
       -
         path = with pkgs.buildPackages; [coreutils gnused gnugrep];

     

       27
       27
       +
         inherit (pkgs) bash;

     

       28
       28
       +
         path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];

     

       29
       29
        
         firmware = pkgs.raspberrypifw;

     

       30
       30
        
         inherit uboot;

     

       31
       31
        
         inherit configTxt;

     

       32
       32
        
         inherit extlinuxConfBuilder;

     

       33
       33
        
         inherit version;

     

       34
       34
        
       }

     

       35
       35
       +

+1 -1

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

···

       12
       12
        
       

     

       13
       13
        
           isExecutable = true;

     

       14
       14
        
       

     

       15
       15
       -
           inherit (pkgs.buildPackages) python3;

     

       15
       15
       +
           inherit (pkgs) python3;

     

       16
       16
        
       

     

       17
       17
        
           systemd = config.systemd.package;

     

       18
       18