movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
Frederik Rietdijk 2019-06-09 12:28:52 +02:00
commit d3afcac771
251 changed files with 8950 additions and 7143 deletions
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 {
src = ./generations-dir-builder.sh;
isExecutable = true;
inherit (pkgs.buildPackages) bash;
path = with pkgs.buildPackages; [coreutils gnused gnugrep];
inherit (pkgs) bash;
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
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;
builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; };
builder = import ./extlinux-conf-builder.nix { inherit pkgs; };
in
{
options = {

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

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

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

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

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

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

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

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