Making the latest haskell expressions appear on 'nix-env -qa'.

More than one person had trouble not finding ghc 6.12 on 'nix-env -qa '*''

svn path=/nixpkgs/trunk/; revision=21477
This commit is contained in:
Lluís Batlle i Rossell 2010-05-01 10:55:05 +00:00
parent b14e71be03
commit 103f51c4da

View File

@ -2305,23 +2305,23 @@ let
*/ */
# Helper functions to abstract away from repetitive instantiations. # Helper functions to abstract away from repetitive instantiations.
haskellPackagesFun610 = ghcPath : profDefault : import ./haskell-packages.nix { haskellPackagesFun610 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
inherit pkgs; inherit pkgs;
enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault;
ghc = import ghcPath { ghc = import ghcPath {
inherit fetchurl stdenv perl ncurses gmp libedit; inherit fetchurl stdenv perl ncurses gmp libedit;
ghc = ghc6101Binary; ghc = ghc6101Binary;
}; };
}; });
haskellPackagesFun612 = ghcPath : profDefault : import ./haskell-packages.nix { haskellPackagesFun612 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
inherit pkgs; inherit pkgs;
enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault;
ghc = import ghcPath { ghc = import ghcPath {
inherit fetchurl stdenv perl ncurses gmp; inherit fetchurl stdenv perl ncurses gmp;
ghc = ghc6101Binary; ghc = ghc6101Binary;
}; };
}; });
# Currently active GHC versions. # Currently active GHC versions.
haskellPackages_ghc6101 = haskellPackages_ghc6101 =