Updated the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=30937
This commit is contained in:
parent
c919a8ae21
commit
c11749dcd6
|
@ -1,19 +1,17 @@
|
||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
|
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.3.20110910";
|
version = "7.3.20111212";
|
||||||
|
|
||||||
name = "ghc-${version}";
|
name = "ghc-${version}";
|
||||||
|
|
||||||
# TODO: Does this have to be here, or can it go to meta?
|
|
||||||
homepage = "http://haskell.org/ghc";
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
|
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
|
||||||
sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5";
|
sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses];
|
buildInputs = [ghc perl gmp ncurses] ++
|
||||||
|
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
||||||
|
|
||||||
buildMK = ''
|
buildMK = ''
|
||||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||||
|
@ -22,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
echo "${buildMK}" > mk/build.mk
|
echo "${buildMK}" > mk/build.mk
|
||||||
|
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags=[
|
configureFlags=[
|
||||||
|
@ -33,11 +32,12 @@ stdenv.mkDerivation rec {
|
||||||
stripDebugFlags=["-S" "--keep-file-symbols"];
|
stripDebugFlags=["-S" "--keep-file-symbols"];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit homepage;
|
homepage = "http://haskell.org/ghc";
|
||||||
description = "The Glasgow Haskell Compiler";
|
description = "The Glasgow Haskell Compiler";
|
||||||
maintainers = [
|
maintainers = [
|
||||||
stdenv.lib.maintainers.marcweber
|
stdenv.lib.maintainers.marcweber
|
||||||
stdenv.lib.maintainers.andres
|
stdenv.lib.maintainers.andres
|
||||||
|
stdenv.lib.maintainers.simons
|
||||||
];
|
];
|
||||||
platforms = ghc.meta.platforms;
|
platforms = ghc.meta.platforms;
|
||||||
};
|
};
|
||||||
|
|
|
@ -2233,7 +2233,8 @@ let
|
||||||
# Reasonably current HEAD snapshot. Should *always* be lowPrio.
|
# Reasonably current HEAD snapshot. Should *always* be lowPrio.
|
||||||
haskellPackages_ghcHEAD =
|
haskellPackages_ghcHEAD =
|
||||||
haskellPackagesFun ../development/compilers/ghc/head.nix
|
haskellPackagesFun ../development/compilers/ghc/head.nix
|
||||||
ghc6121Binary (x : x.ghcHEADPrefs) false false lowPrio;
|
(haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
|
||||||
|
(x : x.ghcHEADPrefs) false false lowPrio;
|
||||||
|
|
||||||
haxeDist = import ../development/compilers/haxe {
|
haxeDist = import ../development/compilers/haxe {
|
||||||
inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;
|
inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;
|
||||||
|
|
|
@ -89,8 +89,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super;
|
ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super;
|
||||||
ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link
|
ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link
|
||||||
ghc721Prefs = super : super // super.haskellPlatformDefaults_future super;
|
ghc721Prefs = super : super // super.haskellPlatformDefaults_future super;
|
||||||
ghc722Prefs = super : super // super.haskellPlatformDefaults_future super;
|
ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; #link
|
||||||
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super; # link
|
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super;
|
||||||
|
|
||||||
# GHC and its wrapper
|
# GHC and its wrapper
|
||||||
#
|
#
|
||||||
|
@ -142,9 +142,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok
|
HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok
|
||||||
network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok
|
network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok
|
||||||
OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok
|
OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok
|
||||||
parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok
|
parallel = self.parallel_3_2_0_0; # 7.2 ok, 7.3 ok
|
||||||
parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok
|
parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok
|
||||||
QuickCheck = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok
|
QuickCheck = self.QuickCheck_2_4_1_1; # 7.2 ok, 7.3 ok
|
||||||
regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok
|
regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok
|
||||||
regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok
|
regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok
|
||||||
regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok
|
regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok
|
||||||
|
@ -169,6 +169,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok
|
mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok
|
||||||
};
|
};
|
||||||
|
|
||||||
|
haskellPlatformDefaults_HEAD =
|
||||||
|
self : self.haskellPlatformDefaults_future self // {
|
||||||
|
deepseq = null; # apparently a core library in ghc-7.3
|
||||||
|
};
|
||||||
|
|
||||||
haskellPlatformArgs_2011_2_0_1 = self : {
|
haskellPlatformArgs_2011_2_0_1 = self : {
|
||||||
inherit (self) cabal ghc;
|
inherit (self) cabal ghc;
|
||||||
cgi = self.cgi_3001_1_7_4;
|
cgi = self.cgi_3001_1_7_4;
|
||||||
|
|
Loading…
Reference in a new issue