From 8d7439eb19892bb91653fb597398b30828d7d8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Sep 2018 14:23:35 +0200 Subject: [PATCH] tarball job: more --show-trace Without that I couldn't well do the grandparent commit. --- pkgs/top-level/make-tarball.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index f7f128547bae..a0c99847274a 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -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