Version bump to ghc-6.10.4.

svn path=/nixpkgs/trunk/; revision=16430
This commit is contained in:
Andres Löh 2009-07-20 13:02:56 +00:00
parent cb82de9ceb
commit 8c6bef0bb0
2 changed files with 40 additions and 5 deletions

View file

@ -0,0 +1,27 @@
{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}:
stdenv.mkDerivation rec {
version = "6.10.4";
name = "ghc-${version}";
homepage = "http://haskell.org/ghc";
src = fetchurl {
url = "${homepage}/dist/${version}/${name}-src.tar.bz2";
sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d";
};
buildInputs = [ghc libedit perl gmp];
configureFlags=[
"--with-gmp-libraries=${gmp}/lib"
"--with-gmp-includes=${gmp}/include"
"--with-gcc=${stdenv.gcc}/bin/gcc"
];
meta = {
inherit homepage;
description = "The Glasgow Haskell Compiler";
};
}

View file

@ -1755,7 +1755,7 @@ let
inherit fetchurl stdenv perl ncurses gmp libedit;
});
haskellPackages = haskellPackages_ghc6103;
haskellPackages = haskellPackages_ghc6104;
haskellPackages_ghc642 = import ./haskell-packages.nix {
inherit pkgs;
@ -1796,21 +1796,21 @@ let
};
});
haskellPackages_ghc6101 = recurseIntoAttrs (import ./haskell-packages.nix {
haskellPackages_ghc6101 = import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.10.1.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
ghc = ghc6101Binary;
};
});
};
haskellPackages_ghc6102 = recurseIntoAttrs (import ./haskell-packages.nix {
haskellPackages_ghc6102 = import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.10.2.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
ghc = ghc6101Binary;
};
});
};
haskellPackages_ghc6103 = recurseIntoAttrs (import ./haskell-packages.nix {
inherit pkgs;
@ -1820,6 +1820,14 @@ let
};
});
haskellPackages_ghc6104 = recurseIntoAttrs (import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.10.4.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
ghc = ghc6101Binary;
};
});
falcon = builderDefsPackage (import ../development/interpreters/falcon) {
inherit cmake;
};