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: 5fd27509cf48
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58823ac10359
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 8, 2020

  1. Revert "nixos/raspberrypi-builder: fix cross using buildPackages"

    The commit enforces buildPackages in the builder but neglects
    the fact that the builder is intended to run on the target system.
    Because of that, the builder will fail when remotely building a
    configuration eg. with nixops or nix-copy-closure.
    
    This reverts commit a6ac6d0.
    kampka committed Sep 8, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    Copy the full SHA
    2c6753f View commit details

Commits on Sep 9, 2020

  1. Merge pull request #97462 from kampka/raspberrypi-builder

    Revert "nixos/raspberrypi-builder: fix cross using buildPackages"
    matthewbauer authored Sep 9, 2020
    Copy the full SHA
    58823ac View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
pkgs.substituteAll {
src = ./raspberrypi-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 configTxt;
}