Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ac6e90696887
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f8c12edfdf2e
Choose a head ref
  • 4 commits
  • 6 files changed
  • 2 contributors

Commits on May 31, 2019

  1. Revert "extlinux-conf: fix cross compilation" 

    This reverts commit f17dd04.
    @kampka
    kampka committed May 31, 2019
    2

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fd15f37 View commit details

  2. Revert "treewide: use buildPackages for config builders" 

    This reverts commit 35af6e3.
    @kampka
    kampka committed May 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0d570e0 View commit details

  3. treewide: use buildPackages for config builders 

    Partially reapplies 35af6e3

buildPackages need to be used only for image builders.
Otherwise, the bootloader builder may be setup using the wrong arch,
rendering it unusable
    @matthewbauer @kampka
    matthewbauer authored and kampka committed May 31, 2019
    Copy the full SHA
    f2a8948 View commit details

Commits on Jun 5, 2019

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

    Build packages for config builders
    @matthewbauer
    matthewbauer authored Jun 5, 2019
    Copy the full SHA
    f8c12ed View commit details
4 changes: 2 additions & 2 deletions nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions nixos/modules/system/boot/loader/init-script/init-script.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 3 deletions nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ let

isExecutable = true;

inherit (pkgs.buildPackages) python3;
inherit (pkgs) python3;

systemd = config.systemd.package;