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

Commits on Jan 16, 2021

  1. nixos-rebuild: put some important dependencies in PATH

    @xaverdh
    xaverdh committed Jan 16, 2021
    Copy the full SHA
    e9abfbd View commit details

  2. Merge pull request #109518 from xaverdh/nixos-rebuild-deps 

    nixos-rebuild: put some important dependencies in PATH
    @domenkozar
    domenkozar authored Jan 16, 2021
    Copy the full SHA
    bb3e088 View commit details
Showing with 12 additions and 4 deletions.
  1. +12 −4 pkgs/os-specific/linux/nixos-rebuild/default.nix
16 changes: 12 additions & 4 deletions pkgs/os-specific/linux/nixos-rebuild/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
{ substituteAll, runtimeShell, jq, nix, lib }:

{ substituteAll
, runtimeShell
, coreutils
, gnused
, gnugrep
, jq
, nix
, lib
}:
let
fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
in substituteAll {
in
substituteAll {
name = "nixos-rebuild";
src = ./nixos-rebuild.sh;
dir = "bin";
isExecutable = true;
inherit runtimeShell nix;
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
path = lib.makeBinPath [ jq ];
path = lib.makeBinPath [ coreutils jq gnused gnugrep ];
}