mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Updated ghc HEAD snapshot to ghc-7.4.1-rc1.
svn path=/nixpkgs/trunk/; revision=31066
This commit is contained in:
parent
f806eca299
commit
8af094c99f
2 changed files with 5 additions and 4 deletions
|
@ -1,13 +1,13 @@
|
||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.3.20111212";
|
version = "7.4.0.20111219";
|
||||||
|
|
||||||
name = "ghc-${version}";
|
name = "ghc-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
|
url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2";
|
||||||
sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
|
sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses] ++
|
buildInputs = [ghc perl gmp ncurses] ++
|
||||||
|
|
|
@ -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
|
||||||
(haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
|
# (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
|
||||||
|
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
|
||||||
(x : x.ghcHEADPrefs) false false lowPrio;
|
(x : x.ghcHEADPrefs) false false lowPrio;
|
||||||
|
|
||||||
haxeDist = import ../development/compilers/haxe {
|
haxeDist = import ../development/compilers/haxe {
|
||||||
|
|
Loading…
Reference in a new issue