diff options
| author | Peter Simons <simons@cryp.to> | 2017-05-09 17:59:28 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-05-09 17:59:28 +0200 |
| commit | a1b6c5f5d6f22088dc017552c94d133128059ad8 (patch) | |
| tree | b2c11a196c67f7c0b94527de5eaecb2ce9abd21f | |
| parent | 342c289d12ab625eecf5d233503c1278fde7b72a (diff) | |
| download | nixlib-a1b6c5f5d6f22088dc017552c94d133128059ad8.tar nixlib-a1b6c5f5d6f22088dc017552c94d133128059ad8.tar.gz nixlib-a1b6c5f5d6f22088dc017552c94d133128059ad8.tar.bz2 nixlib-a1b6c5f5d6f22088dc017552c94d133128059ad8.tar.lz nixlib-a1b6c5f5d6f22088dc017552c94d133128059ad8.tar.xz nixlib-a1b6c5f5d6f22088dc017552c94d133128059ad8.tar.zst nixlib-a1b6c5f5d6f22088dc017552c94d133128059ad8.zip | |
Revert "Use consistent package naming for HEAD.nix files" for GHC and GHCjs.
This reverts commit 31b0e34d1dd1226de1492101e3aeea60292196d7. The version numbers used in that commit were no improvement.
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/head.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 1bf2d4b0ef03..006a9f8fbc46 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -12,7 +12,7 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "2017-01-06"; + version = "8.1.20170106"; rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; commonPreConfigure = '' @@ -29,7 +29,7 @@ let ''; in stdenv.mkDerivation (rec { inherit version rev; - name = "ghc-unstable-${version}"; + name = "ghc-${version}"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 70f2b942e72c..591660f5c347 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,7 +1,7 @@ { fetchgit, fetchFromGitHub, bootPkgs }: bootPkgs.callPackage ./base.nix { - version = "2017-03-23"; + version = "0.2.020170323"; inherit bootPkgs; |