public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forgot to make composedArgsAndFun support function overrides in addition to attrSet-merging ones.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12627
This commit is contained in:
Michael Raskin 2008-08-14 22:12:50 +00:00
parent f1f9e38e94
commit 99c46f200c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/lib/default.nix
View File

@ -32,7 +32,11 @@ rec {
else (innerComposedArgs f (y x)))); else (innerComposedArgs f (y x))));
composedArgs = f: innerComposedArgs f {}; composedArgs = f: innerComposedArgs f {};
sumTwoArgs = f: x: y: (f (x // y)); sumTwoArgs = f: x: y:
if builtins.isAttrs y then
(f (x // y))
else
(f (y x));
composedArgsAndFun = f : x : (f x) // { composedArgsAndFun = f : x : (f x) // {
meta = { meta = {
function = composedArgsAndFun (sumTwoArgs f x); function = composedArgsAndFun (sumTwoArgs f x);