diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-19 11:43:38 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-19 11:43:38 +0000 |
| commit | 5cfba3ac68fbe20c795554bce08fd1cfdc482c8b (patch) | |
| tree | d37861633e9560cad7e4faf0b2288cb0876718b6 /pkgs | |
| parent | e0b8a630a8a682fd7903990bf4b3292beb67b1cd (diff) | |
| download | nixlib-5cfba3ac68fbe20c795554bce08fd1cfdc482c8b.tar nixlib-5cfba3ac68fbe20c795554bce08fd1cfdc482c8b.tar.gz nixlib-5cfba3ac68fbe20c795554bce08fd1cfdc482c8b.tar.bz2 nixlib-5cfba3ac68fbe20c795554bce08fd1cfdc482c8b.tar.lz nixlib-5cfba3ac68fbe20c795554bce08fd1cfdc482c8b.tar.xz nixlib-5cfba3ac68fbe20c795554bce08fd1cfdc482c8b.tar.zst nixlib-5cfba3ac68fbe20c795554bce08fd1cfdc482c8b.zip | |
* Added GHC 6.10.1.
svn path=/nixpkgs/trunk/; revision=15147
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghc/6.10.1.nix | 27 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/6.10.2.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 35 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/6.10.1.nix b/pkgs/development/compilers/ghc/6.10.1.nix new file mode 100644 index 000000000000..deca9d19f1d2 --- /dev/null +++ b/pkgs/development/compilers/ghc/6.10.1.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}: + +stdenv.mkDerivation rec { + version = "6.10.1"; + + name = "ghc-${version}"; + + homepage = "http://haskell.org/ghc"; + + src = fetchurl { + url = "${homepage}/dist/${version}/${name}-src.tar.bz2"; + sha256 = "16q08cxxsmh4hgjhvkl739pc1hh81gljycfq1d2z6m1ld3jpbi22"; + }; + + 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"; + }; +} diff --git a/pkgs/development/compilers/ghc/6.10.2.nix b/pkgs/development/compilers/ghc/6.10.2.nix index 9420e9fea4ad..8568c5661450 100644 --- a/pkgs/development/compilers/ghc/6.10.2.nix +++ b/pkgs/development/compilers/ghc/6.10.2.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { configureFlags=[ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" - #"--with-readline-libraries=${readline}/lib" "--with-gcc=${stdenv.gcc}/bin/gcc" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e955bbe0ee4d..97ac20c2b058 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1873,6 +1873,14 @@ let }; }); + haskellPackages_ghc6101 = recurseIntoAttrs (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 { inherit pkgs; ghc = import ../development/compilers/ghc/6.10.2.nix { |