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

Revert "Use consistent package naming for HEAD.nix files" for GHC and GHCjs. 

This reverts commit 31b0e34d1d. The version
numbers used in that commit were no improvement.
This commit is contained in:
Peter Simons 2017-05-09 17:59:28 +02:00
parent 342c289d12
commit a1b6c5f5d6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ let
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
version = "2017-01-06"; version = "8.1.20170106";
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
commonPreConfigure = '' commonPreConfigure = ''
@ -29,7 +29,7 @@ let
''; '';
in stdenv.mkDerivation (rec { in stdenv.mkDerivation (rec {
inherit version rev; inherit version rev;
name = "ghc-unstable-${version}"; name = "ghc-${version}";
src = fetchgit { src = fetchgit {
url = "git://git.haskell.org/ghc.git"; url = "git://git.haskell.org/ghc.git";

2
pkgs/development/compilers/ghcjs/head.nix
View File

@ -1,7 +1,7 @@
{ fetchgit, fetchFromGitHub, bootPkgs }: { fetchgit, fetchFromGitHub, bootPkgs }:
bootPkgs.callPackage ./base.nix { bootPkgs.callPackage ./base.nix {
version = "2017-03-23"; version = "0.2.020170323";
inherit bootPkgs; inherit bootPkgs;