b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tarball job: more --show-trace

Browse source 
Without that I couldn't well do the grandparent commit.
This commit is contained in:
Vladimír Čunát 2018-09-03 14:23:35 +02:00
parent 66d6e847bb
commit 8d7439eb19
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/make-tarball.nix
View file

@ -54,7 +54,7 @@ releaseTools.sourceTarball rec {
mkdir $TMPDIR/foo
ln -s $(readlink -f .) $TMPDIR/foo/bar
p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace)
p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox)
p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace)
if [ "$p1" != "$p2" ]; then
echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
exit 1
@ -63,9 +63,9 @@ releaseTools.sourceTarball rec {
# 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)" \
res="$(nix-instantiate --eval --strict lib/tests/misc.nix --show-trace)" \
&& [[ "$res" == "[ ]" ]] \
&& res="$(nix-instantiate --eval --strict lib/tests/systems.nix)" \
&& res="$(nix-instantiate --eval --strict lib/tests/systems.nix --show-trace)" \
&& [[ "$res" == "[ ]" ]]
then
true