diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-16 22:00:41 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-16 22:00:41 +0000 |
| commit | ad07109bbad859d9d92245ef1b43bb4b612934cd (patch) | |
| tree | 133d98978fd8875d4ee49fc73cace31844c4738d /pkgs | |
| parent | 3e9cbbc1babb92ebf8736197fa851e1d5c8aa6ea (diff) | |
| download | nixlib-ad07109bbad859d9d92245ef1b43bb4b612934cd.tar nixlib-ad07109bbad859d9d92245ef1b43bb4b612934cd.tar.gz nixlib-ad07109bbad859d9d92245ef1b43bb4b612934cd.tar.bz2 nixlib-ad07109bbad859d9d92245ef1b43bb4b612934cd.tar.lz nixlib-ad07109bbad859d9d92245ef1b43bb4b612934cd.tar.xz nixlib-ad07109bbad859d9d92245ef1b43bb4b612934cd.tar.zst nixlib-ad07109bbad859d9d92245ef1b43bb4b612934cd.zip | |
* Added GHC 6.10.2.
svn path=/nixpkgs/trunk/; revision=15106
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghc/6.10.2.nix | 28 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/6.8.3.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
3 files changed, 36 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghc/6.10.2.nix b/pkgs/development/compilers/ghc/6.10.2.nix new file mode 100644 index 000000000000..9420e9fea4ad --- /dev/null +++ b/pkgs/development/compilers/ghc/6.10.2.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}: + +stdenv.mkDerivation rec { + version = "6.10.2"; + + name = "ghc-${version}"; + + homepage = "http://haskell.org/ghc"; + + src = fetchurl { + url = "${homepage}/dist/${version}/${name}-src.tar.bz2"; + sha256 = "0q3wgp8svfl54kpyp55a1kh63cni5vzz811hqjsps84jdg0lg56m"; + }; + + buildInputs = [ghc libedit perl gmp]; + + configureFlags=[ + "--with-gmp-libraries=${gmp}/lib" + "--with-gmp-includes=${gmp}/include" + #"--with-readline-libraries=${readline}/lib" + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + meta = { + inherit homepage; + description = "The Glasgow Haskell Compiler"; + }; +} diff --git a/pkgs/development/compilers/ghc/6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix index d9f3c1760a15..972ded49dc50 100644 --- a/pkgs/development/compilers/ghc/6.8.3.nix +++ b/pkgs/development/compilers/ghc/6.8.3.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses, haddock}: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "ghc-6.8.3"; homepage = "http://www.haskell.org/ghc"; @@ -32,6 +32,4 @@ stdenv.mkDerivation (rec { # build haddock docs echo "HADDOCK_DOCS = YES" >> mk/build.mk ''; - - installTargets = ["install" "install-docs"]; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73074ad6184b..bf64a4a60ff2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1867,7 +1867,12 @@ let perl = perl58; }); - ghc6103Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix { + ghc6102 = import ../development/compilers/ghc/6.10.2.nix { + inherit fetchurl stdenv perl ncurses gmp libedit; + ghc = ghc6102Binary; + }; + + ghc6102Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix { inherit fetchurl stdenv perl ncurses gmp libedit; }); |