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

Big breaking change. I have radically reduced number of nulls used in all-packages.nix and generally switched to composedArgsAndFun which simply adds .meta.function to everything that has come through it.. I have not tested the build, because OO.o has to be updated...

Browse Source 
svn path=/nixpkgs/trunk/; revision=12625
This commit is contained in:
Michael Raskin 2008-08-14 22:04:30 +00:00
parent a8b28c34af
commit f1f9e38e94
3 changed files with 146 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/construo/0.2.2.nix
View File

@ -7,7 +7,7 @@ args : with args;
}; };
buildInputs = [libX11 zlib xproto] buildInputs = [libX11 zlib xproto]
++ (if args ? mesa then [mesa freeglut] else []) ++ (if args ? mesa then [args.mesa args.freeglut] else [])
; ;
configureFlags = [""]; configureFlags = [""];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */

7
pkgs/lib/default.nix
View File

@ -32,6 +32,13 @@ 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));
composedArgsAndFun = f : x : (f x) // {
meta = {
function = composedArgsAndFun (sumTwoArgs f x);
};
};
# example a = pairMap (x : y : x + y) ["a" "b" "c" "d"]; # example a = pairMap (x : y : x + y) ["a" "b" "c" "d"];
# result: ["ab" "cd"] # result: ["ab" "cd"]
innerPairMap = acc: f: l: innerPairMap = acc: f: l:

387
pkgs/top-level/all-packages.nix
View File

File diff suppressed because it is too large Load Diff