diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-02-10 16:44:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 16:44:54 +0100 |
| commit | 0e6ceb87584feec4836975d8216f9ca4c2199e0e (patch) | |
| tree | 83e9859cafd75d68cd8dcef000295a18b9a3fce3 /lib | |
| parent | 14e842ec021ea18618f893fea8e7ce332f858a4a (diff) | |
| parent | a1fa9e65cab889c4f45e5966d25e45639fc3381b (diff) | |
Merge pull request #68897 from edolstra/master
Flake support
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tests/misc.nix | 2 | ||||
| -rw-r--r-- | lib/tests/release.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 59ed1e507e249..01ff5ecf14850 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -148,7 +148,7 @@ runTests { "${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11"; in { storePath = isStorePath goodPath; - storePathDerivation = isStorePath (import ../.. {}).hello; + storePathDerivation = isStorePath (import ../.. { system = "x86_64-linux"; }).hello; storePathAppendix = isStorePath "${goodPath}/bin/python"; nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 737d142d25324..069c015d783a0 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -2,7 +2,7 @@ pkgs.runCommandNoCC "nixpkgs-lib-tests" { buildInputs = [ pkgs.nix (import ./check-eval.nix) ]; - NIX_PATH="nixpkgs=${pkgs.path}"; + NIX_PATH = "nixpkgs=${toString pkgs.path}"; } '' datadir="${pkgs.nix}/share" export TEST_ROOT=$(pwd)/test-tmp |