Skip to content

Commit

Permalink
ghcHEAD: 8.9.20190601 -> 8.9.20190924
Browse files Browse the repository at this point in the history
Also close pointless diff with 8.8.1.
  • Loading branch information
Ericson2314 committed Sep 27, 2019
1 parent 991f825 commit b55854c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pkgs/development/compilers/ghc/head.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
, # Whetherto build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows

, version ? "8.9.20190601"
, version ? "8.9.20190924"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
Expand Down Expand Up @@ -89,8 +89,8 @@ stdenv.mkDerivation (rec {

src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204";
sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v";
rev = "795986aaf33e2ffc233836b86a92a77366c91db2";
sha256 = "0a111x6c53r07q5qdg6c8mnydqp0wh4mpxmw7ga4x5wlap8i0bji";
};

enableParallelBuilding = true;
Expand Down Expand Up @@ -183,7 +183,7 @@ stdenv.mkDerivation (rec {

nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
bootPkgs.ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];

# For building runtime libs
Expand Down Expand Up @@ -224,14 +224,14 @@ stdenv.mkDerivation (rec {
inherit enableShared;

# Our Cabal compiler name
haskellCompilerName = "ghc-8.7";
haskellCompilerName = "ghc-${version}";
};

meta = {
homepage = http://haskell.org/ghc;
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (bootPkgs.ghc.meta) license platforms;
inherit (ghc.meta) license platforms;
};

} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
Expand Down

0 comments on commit b55854c

Please sign in to comment.