Author: shlevy
Date: Wed Sep 14 05:59:17 2011
New Revision: 29265
URL: https://ssl.nixos.org/websvn/nix/?rev=29265&sc=1
Log:
First attempt at the output-as-derivation semantics
For each output, this adds a corresponding attribute to the derivation that is
the same as the derivation except for outPath, which is set to the path specific
to that output. Additionally, an "all" attribute is added that is a list of all
of the output derivations. This has to be done outside of derivationStrict as
each output is itself a derivation that contains itself (and all other outputs)
as an attribute. The derivation itself is equivalent to the first output in the
outputs list (or "out" if that list isn't set).
Modified:
nix/branches/multiple-outputs-sandbox/src/libexpr/primops.cc
Modified: nix/branches/multiple-outputs-sandbox/src/libexpr/primops.cc
==============================================================================
--- nix/branches/multiple-outputs-sandbox/src/libexpr/primops.cc Wed Sep
14 04:06:43 2011 (r29264)
+++ nix/branches/multiple-outputs-sandbox/src/libexpr/primops.cc Wed Sep
14 05:59:17 2011 (r29265)
@@ -1052,15 +1052,6 @@
addPrimOp("__getEnv", 1, prim_getEnv);
addPrimOp("__trace", 2, prim_trace);
- // Derivations
- addPrimOp("derivationStrict", 1, prim_derivationStrict);
-
- /* Add a wrapper around the derivation primop that computes the
- `drvPath' and `outPath' attributes lazily. */
- string s = "attrs: let res = derivationStrict attrs; in attrs // { drvPath
= res.drvPath; outPath = res.outPath; type = \"derivation\"; }";
- mkThunk_(v, parseExprFromString(s, "/"));
- addConstant("derivation", v);
-
// Paths
addPrimOp("__toPath", 1, prim_toPath);
addPrimOp("__storePath", 1, prim_storePath);
@@ -1109,6 +1100,33 @@
addPrimOp("__parseDrvName", 1, prim_parseDrvName);
addPrimOp("__compareVersions", 2, prim_compareVersions);
+ // Derivations
+ addPrimOp("derivationStrict", 1, prim_derivationStrict);
+
+ /* Add a wrapper around the derivation primop that computes the
+ `drvPath' and `outPath' attributes lazily. */
+ string s = "attrs: \
+ let \
+ strict = derivationStrict attrs; \
+ attrValues = attrs: \
+ map (name: builtins.getAttr name attrs) (builtins.attrNames attrs); \
+ outputToAttrListElement = output: \
+ let outPath = builtins.getAttr (output + \"Path\") strict; in { \
+ name = output; \
+ value = attrs // { \
+ drvPath = strict.drvPath; inherit outPath; type =
\"derivation\"; \
+ } // outputsAttrs // { all = allList; }; \
+ }; \
+ outputsList = if attrs ? outputs then \
+ map outputToAttrListElement attrs.outputs else \
+ [ (outputToAttrListElement \"out\") ]; \
+ outputsAttrs = builtins.listToAttrs outputsList; \
+ allList = attrValues outputsAttrs; \
+ head = if attrs ? outputs then builtins.head attrs.outputs else
\"out\"; \
+ in builtins.getAttr head outputsAttrs";
+ mkThunk_(v, parseExprFromString(s, "/"));
+ addConstant("derivation", v);
+
/* Now that we've added all primops, sort the `builtins' attribute
set, because attribute lookups expect it to be sorted. */
baseEnv.values[0]->attrs->sort();
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
