Author: NicolasPierron
Date: Sat Apr 23 17:53:05 2011
New Revision: 26936
URL: https://svn.nixos.org/websvn/nix/?rev=26936&sc=1
Log:
nixos-option: Handle Lambdas in the injection of previously pretty-printed
output.
Modified:
nixos/trunk/modules/installer/tools/nixos-option.sh
Modified: nixos/trunk/modules/installer/tools/nixos-option.sh
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-option.sh Sat Apr 23 13:54:25
2011 (r26935)
+++ nixos/trunk/modules/installer/tools/nixos-option.sh Sat Apr 23 17:53:05
2011 (r26936)
@@ -316,7 +316,7 @@
# echo 1>&2 "Warning: This value is not an option."
result=$(evalCfg)
- if names=$(echo "builtins.attrNames $result" | sed 's,<CODE>,"<CODE>",g' |
nix-instantiate - --eval-only --strict 2> /dev/null); then
+ if names=$(echo "builtins.attrNames $result" | sed 's,<[A-Z]*>,0,g' |
nix-instantiate - --eval-only --strict 2> /dev/null); then
echo 1>&2 "This attribute set contains:"
for attr in $names; do
test $attr = '[' -o $attr = ']' && continue;
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
