Author: eelco
Date: Wed Jan 4 11:56:15 2012
New Revision: 31271
URL: https://nixos.org/websvn/nix/?rev=31271&sc=1
Log:
* Export the original input attributes of the derivation in
‘drvAttrs’. This will simplify the implementation of functions such
as ‘overrideDerivation’ in Nixpkgs, which need to filter out any
added attributes such as outPath.
Modified:
nix/branches/multiple-outputs-sandbox/corepkgs/derivation.nix
Modified: nix/branches/multiple-outputs-sandbox/corepkgs/derivation.nix
==============================================================================
--- nix/branches/multiple-outputs-sandbox/corepkgs/derivation.nix Wed Jan
4 11:04:19 2012 (r31270)
+++ nix/branches/multiple-outputs-sandbox/corepkgs/derivation.nix Wed Jan
4 11:56:15 2012 (r31271)
@@ -7,7 +7,10 @@
strict = derivationStrict drvAttrs;
- commonAttrs = drvAttrs // (builtins.listToAttrs outputsList) // { all = map
(x: x.value) outputsList; };
+ commonAttrs = drvAttrs // (builtins.listToAttrs outputsList) //
+ { all = map (x: x.value) outputsList;
+ inherit drvAttrs;
+ };
outputToAttrListElement = outputName:
{ name = outputName;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
