From bddc83a1487e9f3c1bb3ac2279c0238e8e6c3ff3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2007 16:17:04 +0000 Subject: * New builtin function "isFunction". You're not supposed to use it ;-) * Channels: fix channels that are plain lists of derivations (like strategoxt-unstable) instead of functions (like nixpkgs-unstable). This fixes the error message "error: the left-hand side of the function call is neither a function nor a primop (built-in operation) but a list". --- corepkgs/channels/unpack.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'corepkgs') diff --git a/corepkgs/channels/unpack.sh.in b/corepkgs/channels/unpack.sh.in index 03c6e5b2f894..1f2886a6ab4f 100644 --- a/corepkgs/channels/unpack.sh.in +++ b/corepkgs/channels/unpack.sh.in @@ -24,7 +24,7 @@ for ((n = 0; n < ${#inputs[*]}; n += 2)); do @coreutils@/mv * ../$dirName # !!! hacky attrName=$(echo $dirName | @tr@ -- '- ' '__') - echo "$attrName = import ./$dirName {};" >> $expr + echo "$attrName = let e = import ./$dirName; in if builtins.isFunction e then e {} else e;" >> $expr done echo '} // {_combineChannels = true;}' >> $expr -- cgit 1.4.1