Merge branch 'master.upstream' into staging.upstream

2015-08-13 11:55:02 -07:00
parent 257db17ee9 bc9bd5c02c
commit 952def0e3c
146 changed files with 14613 additions and 9539 deletions
@@ -28,7 +28,7 @@ in

 stdenv.mkDerivation rec {
  version = "7.11.20150718";
-  name = "ghc-nokinds-${version}";
+  name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details.
  rev = "4cb79c85a4976c509a65a8638899391a60cd0962";

  src = fetchgit {
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {

  postUnpack = ''
    pushd ghc-${builtins.substring 0 7 rev}
+    echo ${version} >VERSION
+    echo ${rev} >GIT_COMMIT_ID
    patchShebangs .
    ./boot
    popd