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

Revert "Build GHC HEAD from git checkout".

Browse Source 
This reverts commit 52c8d7c4ab0b2b2c97faa848b98dfc0ae9b69d7b. The new
expression doesn't compile: http://hydra.nixos.org/build/19594431/nixlog/1/raw.
This commit is contained in:
Peter Simons 2015-02-12 20:15:09 +01:00
parent cf1550cbbf
commit 15416dd2ec
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/compilers/ghc/head.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, ghc, perl, gmp, ncurses, autoconf, automake, happy, alex }: { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
let let
@ -15,21 +15,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.11.20150118"; version = "7.11.20150118";
name = "ghc-${version}"; name = "ghc-${version}";
rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4";
src = fetchgit { src = fetchurl {
url = "git://git.haskell.org/ghc.git"; url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2";
inherit rev; sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20";
sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6";
}; };
postUnpack = '' buildInputs = [ ghc perl ];
pushd ghc-${builtins.substring 0 7 rev}
./boot
popd
'';
buildInputs = [ ghc perl autoconf automake happy alex ];
preConfigure = '' preConfigure = ''
echo >mk/build.mk "${buildMK}" echo >mk/build.mk "${buildMK}"
@ -47,7 +39,7 @@ stdenv.mkDerivation rec {
# required, because otherwise all symbols from HSffi.o are stripped, and # required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort # that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; stripDebugFlags = [ "-S" "--keep-file-symbols" ];
meta = { meta = {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";

2
pkgs/top-level/haskell-ng.nix
View File

@ -18,7 +18,7 @@ rec {
ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { ghc = compiler.ghc704Binary; gmp = pkgs.gmp.override { withStatic = true; }; };
ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; gmp = pkgs.gmp.override { withStatic = true; }; };
ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; }; ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix { inherit (packages.ghc784) ghc happy alex; gmp = pkgs.gmp.override { withStatic = true; }; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; };
ghc = compiler.ghc784; ghc = compiler.ghc784;
}; };