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

added missing arguments, and fixed things due to changse ins ghcsAndLibs 

svn path=/nixpkgs/trunk/; revision=10690
This commit is contained in:
Marc Weber 2008-02-14 14:41:17 +00:00
parent dbc5fb085c
commit 86ec66baa1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1129,7 +1129,7 @@ rec {
assert builtins ? listToAttrs; assert builtins ? listToAttrs;
recurseIntoAttrs (import ../development/compilers/ghcs { recurseIntoAttrs (import ../development/compilers/ghcs {
inherit ghcboot fetchurl recurseIntoAttrs perl gnum4 gmp readline lib; inherit ghcboot fetchurl recurseIntoAttrs perl gnum4 gmp readline lib;
inherit ghcPkgUtil; inherit ghcPkgUtil annotatedDerivations hasktags ctags;
stdenv = stdenvUsingSetupNew2; stdenv = stdenvUsingSetupNew2;
}); });
@ -1218,7 +1218,7 @@ rec {
# introducing p here to speed things up. # introducing p here to speed things up.
# It merges derivations (defined below) and additional inputs. I hope that using as few nix functions as possible results in greates speed? # It merges derivations (defined below) and additional inputs. I hope that using as few nix functions as possible results in greates speed?
# unfortunately with x; won't work because it forces nix to evaluate all attributes of x which would lead to infinite recursion # unfortunately with x; won't work because it forces nix to evaluate all attributes of x which would lead to infinite recursion
pkgs = let x = ghc.all_libs // derivations; in { pkgs = let x = ghc.core_libs // derivations; in {
# ghc extra packages # ghc extra packages
mtl = { name="mtl-1.1.0.0"; srcDir="libraries/mtl"; p_deps=[ x.base ]; src = ghc.extra_src; }; mtl = { name="mtl-1.1.0.0"; srcDir="libraries/mtl"; p_deps=[ x.base ]; src = ghc.extra_src; };
parsec = { name="parsec-2.1.0.0"; srcDir="libraries/parsec"; p_deps=[ x.base ]; src = ghc.extra_src; }; parsec = { name="parsec-2.1.0.0"; srcDir="libraries/parsec"; p_deps=[ x.base ]; src = ghc.extra_src; };