about summary refs log tree commit diff
path: root/corepkgs/channels
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2007-05-16T16·17+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2007-05-16T16·17+0000
commitbddc83a1487e9f3c1bb3ac2279c0238e8e6c3ff3 (patch)
tree1466672b9f0eb9096cc33af950e964bfdf044f4d /corepkgs/channels
parentca00aa11714921804afb490d0613086f549fb894 (diff)
* 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".

Diffstat (limited to 'corepkgs/channels')
-rw-r--r--corepkgs/channels/unpack.sh.in2
1 files changed, 1 insertions, 1 deletions
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