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/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f7454db4529d
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a01ff6b4760
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 19, 2018

  1. Fix tests.evalNixOS 

    This failed because NixOS' release.nix calls builtins.fetchGit.

(cherry picked from commit a99027d)
    @edolstra
    edolstra committed Apr 19, 2018
    Copy the full SHA
    5a01ff6 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 release.nix
3 changes: 2 additions & 1 deletion release.nix
View file
Original file line number Diff line number Diff line change
@@ -264,7 +264,8 @@ let
export NIX_STATE_DIR=$TMPDIR
nix-store --init
nix-instantiate ${nixpkgs}/nixos/release-combined.nix -A tested --dry-run
nix-instantiate ${nixpkgs}/nixos/release-combined.nix -A tested --dry-run \
--arg nixpkgs '{ outPath = ${nixpkgs}; revCount = 123; shortRev = "abcdefgh"; }'
touch $out
'';