public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #62333 from kampka/buildPackages-for-config-builders

Browse Source 
Build packages for config builders
This commit is contained in:
Matthew Bauer 2019-06-05 14:47:16 -04:00 committed by GitHub
commit f8c12edfdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
View File

@ -7,8 +7,8 @@ let
generationsDirBuilder = pkgs.substituteAll { generationsDirBuilder = pkgs.substituteAll {
src = ./generations-dir-builder.sh; src = ./generations-dir-builder.sh;
isExecutable = true; isExecutable = true;
inherit (pkgs.buildPackages) bash; inherit (pkgs) bash;
path = with pkgs.buildPackages; [coreutils gnused gnugrep]; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
inherit (config.boot.loader.generationsDir) copyKernels; inherit (config.boot.loader.generationsDir) copyKernels;
}; };

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

@ -8,7 +8,7 @@ let
timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; }; builder = import ./extlinux-conf-builder.nix { inherit pkgs; };
in in
{ {
options = { options = {

4
nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
View File

@ -3,6 +3,6 @@
pkgs.substituteAll { pkgs.substituteAll {
src = ./extlinux-conf-builder.sh; src = ./extlinux-conf-builder.sh;
isExecutable = true; isExecutable = true;
path = [pkgs.buildPackages.coreutils pkgs.buildPackages.gnused pkgs.buildPackages.gnugrep]; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
inherit (pkgs.buildPackages) bash; inherit (pkgs) bash;
} }

4
nixos/modules/system/boot/loader/init-script/init-script.nix
View File

@ -7,8 +7,8 @@ let
initScriptBuilder = pkgs.substituteAll { initScriptBuilder = pkgs.substituteAll {
src = ./init-script-builder.sh; src = ./init-script-builder.sh;
isExecutable = true; isExecutable = true;
inherit (pkgs.buildPackages) bash; inherit (pkgs) bash;
path = with pkgs.buildPackages; [coreutils gnused gnugrep]; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
}; };
in in

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

@ -18,17 +18,18 @@ let
extlinuxConfBuilder = extlinuxConfBuilder =
import ../generic-extlinux-compatible/extlinux-conf-builder.nix { import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
pkgs = pkgs.buildPackages; inherit pkgs;
}; };
in in
pkgs.substituteAll { pkgs.substituteAll {
src = ./uboot-builder.sh; src = ./uboot-builder.sh;
isExecutable = true; isExecutable = true;
inherit (pkgs.buildPackages) bash; inherit (pkgs) bash;
path = with pkgs.buildPackages; [coreutils gnused gnugrep]; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
firmware = pkgs.raspberrypifw; firmware = pkgs.raspberrypifw;
inherit uboot; inherit uboot;
inherit configTxt; inherit configTxt;
inherit extlinuxConfBuilder; inherit extlinuxConfBuilder;
inherit version; inherit version;
} }

2
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View File

@ -12,7 +12,7 @@ let
isExecutable = true; isExecutable = true;
inherit (pkgs.buildPackages) python3; inherit (pkgs) python3;
systemd = config.systemd.package; systemd = config.systemd.package;