public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ghc-7.4.1. Remove Hydra building for the 7.2.* series.

Browse Source 
svn path=/nixpkgs/trunk/; revision=31989
This commit is contained in:
Andres Löh 2012-02-02 21:08:30 +00:00
parent f113ee27ad
commit b66db5ca13
3 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/development/compilers/ghc/7.4.1.nix Normal file
View File

@ -0,0 +1,44 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec {
version = "7.4.1";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
};
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;
};
}

16
pkgs/top-level/all-packages.nix
View File

@ -2274,16 +2274,20 @@ let
(x : x.ghc704Prefs) false false (x : x); (x : x.ghc704Prefs) false false (x : x);
haskellPackages_ghc721 = haskellPackages_ghc721 =
recurseIntoAttrs haskellPackagesFun ../development/compilers/ghc/7.2.1.nix
(haskellPackagesFun ../development/compilers/ghc/7.2.1.nix (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary) (x : x.ghc721Prefs) false false lowPrio;
(x : x.ghc721Prefs) false false lowPrio);
haskellPackages_ghc722 = haskellPackages_ghc722 =
haskellPackagesFun ../development/compilers/ghc/7.2.2.nix
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghc722Prefs) false false lowPrio;
haskellPackages_ghc741 =
recurseIntoAttrs recurseIntoAttrs
(haskellPackagesFun ../development/compilers/ghc/7.2.2.nix (haskellPackagesFun ../development/compilers/ghc/7.4.1.nix
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary) (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghc722Prefs) false false lowPrio); (x : x.ghc741Prefs) false false lowPrio);
# Reasonably current HEAD snapshot. Should *always* be lowPrio. # Reasonably current HEAD snapshot. Should *always* be lowPrio.
haskellPackages_ghcHEAD = haskellPackages_ghcHEAD =

1
pkgs/top-level/haskell-packages.nix
View File

@ -90,6 +90,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_4_0_0 super; # link ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_4_0_0 super; # link
ghc721Prefs = super : super // super.haskellPlatformDefaults_future super; ghc721Prefs = super : super // super.haskellPlatformDefaults_future super;
ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; #link ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; #link
ghc741Prefs = super : super // super.haskellPlatformDefaults_HEAD super;
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super; ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super;
# GHC and its wrapper # GHC and its wrapper