nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 07:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: use buildPackages for config builders

Browse Source
This commit is contained in:
Matthew Bauer 2018-12-28 13:41:51 -06:00
parent 3dee4f2c71
commit 35af6e3605
8 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
let let
extlinux-conf-builder = extlinux-conf-builder =
import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
inherit pkgs; pkgs = pkgs.buildPackages;
}; };
in in
{ {

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

@ -5,7 +5,7 @@
let let
extlinux-conf-builder = extlinux-conf-builder =
import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
inherit pkgs; pkgs = pkgs.buildPackages;
}; };
in in
{ {

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

@ -5,7 +5,7 @@
let let
extlinux-conf-builder = extlinux-conf-builder =
import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
inherit pkgs; pkgs = pkgs.buildPackages;
}; };
in in
{ {

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) bash; inherit (pkgs.buildPackages) bash;
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; path = with pkgs.buildPackages; [coreutils gnused 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 { inherit pkgs; }; builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; };
in in
{ {
options = { options = {

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) bash; inherit (pkgs.buildPackages) bash;
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; path = with pkgs.buildPackages; [coreutils gnused gnugrep];
}; };
in in

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

@ -18,18 +18,17 @@ let
extlinuxConfBuilder = extlinuxConfBuilder =
import ../generic-extlinux-compatible/extlinux-conf-builder.nix { import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
inherit pkgs; pkgs = pkgs.buildPackages;
}; };
in in
pkgs.substituteAll { pkgs.substituteAll {
src = ./uboot-builder.sh; src = ./uboot-builder.sh;
isExecutable = true; isExecutable = true;
inherit (pkgs) bash; inherit (pkgs.buildPackages) bash;
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; path = with pkgs.buildPackages; [coreutils gnused 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) python3; inherit (pkgs.buildPackages) python3;
systemd = config.systemd.package; systemd = config.systemd.package;