diff options
| author | Domen Kožar <domen@enlambda.com> | 2017-08-10 09:30:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 09:30:00 +0200 |
| commit | ff5fd118b9fa119adf3482abd2c47e5ddd78766c (patch) | |
| tree | b8b492f4a502701384bd7c234026a81219dcc096 /pkgs | |
| parent | b224644795bc2601da244b0e708ca7754bac64d4 (diff) | |
| parent | 770743bd91685befe4e3f1caee280d54c17aa641 (diff) | |
| download | nixlib-ff5fd118b9fa119adf3482abd2c47e5ddd78766c.tar nixlib-ff5fd118b9fa119adf3482abd2c47e5ddd78766c.tar.gz nixlib-ff5fd118b9fa119adf3482abd2c47e5ddd78766c.tar.bz2 nixlib-ff5fd118b9fa119adf3482abd2c47e5ddd78766c.tar.lz nixlib-ff5fd118b9fa119adf3482abd2c47e5ddd78766c.tar.xz nixlib-ff5fd118b9fa119adf3482abd2c47e5ddd78766c.tar.zst nixlib-ff5fd118b9fa119adf3482abd2c47e5ddd78766c.zip | |
Merge pull request #28044 from mpickering/ghc-head
GHC Head updates
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 5a505f39b1a7..362b4895b7e3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -5,6 +5,7 @@ # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. , enableIntegerSimple ? false, gmp +, version ? "8.3.20170808" }: let @@ -12,8 +13,7 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "8.1.20170106"; - rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; + rev = "14457cf6a50f708eecece8f286f08687791d51f7"; commonPreConfigure = '' echo ${version} >VERSION @@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0"; + sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y"; }; postPatch = "patchShebangs ."; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 81a32e1219fe..09e3835712fe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -84,7 +84,7 @@ in rec { selfPkgs = packages.ghc821; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { - bootPkgs = packages.ghc7103; + bootPkgs = packages.ghc802; inherit (bootPkgs) alex happy; inherit buildPlatform targetPlatform; selfPkgs = packages.ghcHEAD; |