fixes
svn path=/configurations/trunk/tud/; revision=11334
Martin Bravenboer committed
Mar 28, 2008 at 23:03 UTC
c05e1118acec08c2a5a4ea70e51031cbc8b25d75
1 file changed
+5
-5
supervisor/strategoxt/easy-job.nix
+5
-5
@@ -42,7 +42,7 @@ rec {
42
} // attrs)
43
// {
44
inputs =
45
- ((refspec.svnInput attrs.svn) // refspec.requiresInputs)
45
+ ((refspec.svnInputAttrs attrs.svn) // refspec.requiresInputs)
46
// (if attrs ? inputs then attrs.inputs else {});
47
});
48
@@ -91,9 +91,9 @@ rec {
91
* with attributes for the variant.
92
*/
93
svnInputAttrValue = variant :
94
- builtins.getAttr variant spec.svn;
94
+ svnInput (builtins.getAttr variant spec.svn);
95
96
- svnInput = variant :
96
+ svnInputAttrs = variant :
97
(builtins.listToAttrs [
98
{ name = svnInputAttrName;
99
value = svnInputAttrValue variant;
@@ -103,7 +103,7 @@ rec {
103
/**
104
* The info attribute name is by convention ${attrPrefix}Info
105
*/
106
- internalInfoInput =
106
+ infoInputAttr =
107
{ name = infoInputAttrName;
108
value = infoInputAttrValue;
109
};
@@ -123,7 +123,7 @@ rec {
123
124
requiresInputs =
125
builtins.listToAttrs (
126
- map (somespec : (reflect somespec).internalInfoInput) requiresClosure
126
+ map (somespec : (reflect somespec).infoInputAttr) requiresClosure
127
);
128
129
/**