diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-10 11:45:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-07-11 18:02:05 +0200 |
| commit | 8931db9f0b0ca57f3ceb8e7410a28085f7bdbe54 (patch) | |
| tree | c34ca732310e4ec108acf391a8a2bc0e87cbfca4 /pkgs/top-level/make-tarball.nix | |
| parent | 807413384443b3e65d8f4624b6650695f7c18e78 (diff) | |
make-tarball / lib-tests: reduce duplication
The misc.nix and systems.nix tests were invoked at three different places. Let's not that.
Diffstat (limited to 'pkgs/top-level/make-tarball.nix')
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index a0c99847274a8..6f30bd06a81c9 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -6,6 +6,7 @@ , officialRelease , pkgs ? import nixpkgs.outPath {} , nix ? pkgs.nix +, lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; } }: with pkgs; @@ -18,7 +19,7 @@ releaseTools.sourceTarball rec { version = pkgs.lib.fileContents ../../.version; versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - buildInputs = [ nix.out jq ]; + buildInputs = [ nix.out jq lib-tests ]; configurePhase = '' eval "$preConfigure" @@ -60,20 +61,6 @@ releaseTools.sourceTarball rec { exit 1 fi - # Run the regression tests in `lib'. - if - # `set -e` doesn't work inside here, so need to && instead :( - res="$(nix-instantiate --eval --strict lib/tests/misc.nix --show-trace)" \ - && [[ "$res" == "[ ]" ]] \ - && res="$(nix-instantiate --eval --strict lib/tests/systems.nix --show-trace)" \ - && [[ "$res" == "[ ]" ]] - then - true - else - echo "regression tests for lib failed, got: $res" - exit 1 - fi - # Check that all-packages.nix evaluates on a number of platforms without any warnings. for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking Nixpkgs on $platform" |