MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ghc-head: bump

Browse source
This commit is contained in:
Shea Levy 2017-01-06 08:39:12 -05:00
parent 39bb4fe0ee
commit 3c2cbd3259
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/compilers/ghc/head.nix
View file

@ -7,7 +7,7 @@ let
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
version = "8.1.20161224";
version = "8.1.20170106";
commonPreConfigure = ''
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@ -19,12 +19,12 @@ let
in stdenv.mkDerivation (rec {
inherit version;
name = "ghc-${version}";
rev = "2689a1692636521777f007861a484e7064b2d696";
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
src = fetchgit {
url = "git://git.haskell.org/ghc.git";
inherit rev;
sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr";
sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0";
};
postPatch = "patchShebangs .";
@ -86,9 +86,6 @@ in stdenv.mkDerivation (rec {
} // stdenv.lib.optionalAttrs (cross != null) {
name = "${cross.config}-ghc-${version}";
# Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713)
patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ];
preConfigure = commonPreConfigure + ''
sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk
'';