From 66bd9580f063d818167a62c7cab3de40bc83c925 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Nov 2011 22:19:03 +0000 Subject: [PATCH] Added GHC 7.2.2. svn path=/nixpkgs/trunk/; revision=30398 --- pkgs/development/compilers/ghc/7.2.2.nix | 44 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ pkgs/top-level/haskell-packages.nix | 1 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/development/compilers/ghc/7.2.2.nix diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix new file mode 100644 index 000000000000..358f41dcf089 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: + +stdenv.mkDerivation rec { + version = "7.2.2"; + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz"; + }; + + buildInputs = [ghc perl gmp ncurses] ++ + (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + ''; + + configureFlags=[ + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags=["-S" "--keep-file-symbols"]; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons + ]; + platforms = ghc.meta.platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4707cf3fe77..6e76d730a6a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2211,6 +2211,12 @@ let (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) (x : x.ghc721Prefs) false false lowPrio); + haskellPackages_ghc722 = + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/7.2.2.nix + (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) + (x : x.ghc722Prefs) false false lowPrio); + # Reasonably current HEAD snapshot. Should *always* be lowPrio. haskellPackages_ghcHEAD = haskellPackagesFun ../development/compilers/ghc/head.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 69f3c28bc9dd..95b17115b2f0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -89,6 +89,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link ghc721Prefs = super : super // super.haskellPlatformDefaults_future super; + ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super; # link # GHC and its wrapper