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

updating haskellPackages was a bad idea. Some packages broke. Revert to privious default.

Browse Source 
svn path=/nixpkgs/trunk/; revision=19368
This commit is contained in:
Marc Weber 2010-01-12 10:34:20 +00:00
parent 2eb0633c5f
commit da167ed64f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1951,7 +1951,7 @@ let
# For several compiler versions, we export a large set of Haskell-related # For several compiler versions, we export a large set of Haskell-related
# packages. # packages.
haskellPackages = haskellPackages_ghc6121; haskellPackages = haskellPackages_ghc6104;
/* /*
haskellPackages_ghc642 = import ./haskell-packages.nix { haskellPackages_ghc642 = import ./haskell-packages.nix {
@ -2027,13 +2027,14 @@ let
}; };
}); });
haskellPackages_ghc6121 = import ./haskell-packages.nix { # make this ghc default when it's supported by the Haskell Platform
haskellPackages_ghc6121 = lowPrio (import ./haskell-packages.nix {
inherit pkgs; inherit pkgs;
ghc = import ../development/compilers/ghc/6.12.1.nix { ghc = import ../development/compilers/ghc/6.12.1.nix {
inherit fetchurl stdenv perl ncurses gmp; inherit fetchurl stdenv perl ncurses gmp;
ghc = ghc6101Binary; ghc = ghc6101Binary;
}; };
}; });
haskellPackages_ghcHEAD = import ./haskell-packages.nix { haskellPackages_ghcHEAD = import ./haskell-packages.nix {
inherit pkgs; inherit pkgs;