Author: urkud
Date: Tue Jan 24 19:10:54 2012
New Revision: 31824
URL: https://nixos.org/websvn/nix/?rev=31824&sc=1
Log:
test-eval-release: handle ENV{VERBOSE}.
See test-eval-release.sh for details.
Modified:
nixpkgs/trunk/maintainers/scripts/eval-release.nix
nixpkgs/trunk/maintainers/scripts/test-eval-release.sh
Modified: nixpkgs/trunk/maintainers/scripts/eval-release.nix
==============================================================================
--- nixpkgs/trunk/maintainers/scripts/eval-release.nix Tue Jan 24 15:06:39
2012 (r31823)
+++ nixpkgs/trunk/maintainers/scripts/eval-release.nix Tue Jan 24 19:10:54
2012 (r31824)
@@ -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 @@
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
Modified: nixpkgs/trunk/maintainers/scripts/test-eval-release.sh
==============================================================================
--- nixpkgs/trunk/maintainers/scripts/test-eval-release.sh Tue Jan 24
15:06:39 2012 (r31823)
+++ nixpkgs/trunk/maintainers/scripts/test-eval-release.sh Tue Jan 24
19:10:54 2012 (r31824)
@@ -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
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
