diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-24 19:10:54 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-24 19:10:54 +0000 |
commit | 954c8cdac1eedf26bcd8a0961203c4f7b1c3b55b (patch) | |
tree | 7c2d6321d7998360b75ec88855a799e1a3c4d4a9 /maintainers | |
parent | c7dc7f5e871aea8495be86d5fd70dab118355b62 (diff) | |
download | nixpkgs-954c8cdac1eedf26bcd8a0961203c4f7b1c3b55b.tar nixpkgs-954c8cdac1eedf26bcd8a0961203c4f7b1c3b55b.tar.gz nixpkgs-954c8cdac1eedf26bcd8a0961203c4f7b1c3b55b.tar.bz2 nixpkgs-954c8cdac1eedf26bcd8a0961203c4f7b1c3b55b.tar.lz nixpkgs-954c8cdac1eedf26bcd8a0961203c4f7b1c3b55b.tar.xz nixpkgs-954c8cdac1eedf26bcd8a0961203c4f7b1c3b55b.tar.zst nixpkgs-954c8cdac1eedf26bcd8a0961203c4f7b1c3b55b.zip |
test-eval-release: handle ENV{VERBOSE}.
See test-eval-release.sh for details. svn path=/nixpkgs/trunk/; revision=31824
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/scripts/eval-release.nix | 3 | ||||
-rwxr-xr-x | maintainers/scripts/test-eval-release.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 836e4312c44..7fac2a1c2ef 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -5,6 +5,7 @@ with import ../../pkgs/lib; let + trace = if (builtins.getEnv "VERBOSE") == "1" then builtins.trace else (x: y: y); rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ]; @@ -15,7 +16,7 @@ let maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null; call = attrs: flip mapAttrs attrs - (n: v: /* builtins.trace n */ ( + (n: v: trace n ( if builtins.isFunction v then maybe (v { system = "i686-linux"; }) else if builtins.isAttrs v then call v else null diff --git a/maintainers/scripts/test-eval-release.sh b/maintainers/scripts/test-eval-release.sh index 16921a24ce2..4ab3f9775a0 100755 --- a/maintainers/scripts/test-eval-release.sh +++ b/maintainers/scripts/test-eval-release.sh @@ -1,3 +1,6 @@ #! /bin/sh +if [[ -z "$VERBOSE" ]]; then + echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" +fi nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null |