Merge branch 'master.upstream' into staging.upstream

2015-08-09 13:34:18 -07:00
parent d3ac5c534d 6cfff02b9b
commit 6e698f9c61
61 changed files with 848 additions and 431 deletions
@@ -17,18 +17,20 @@ let
 in

 stdenv.mkDerivation rec {
-  version = "7.11.20150705";
+  version = "7.11.20150809";
  name = "ghc-${version}";
-  rev = "3fabb71a559b493efdfb5bb91907f6a0f696a114";
+  rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977";

  src = fetchgit {
    url = "git://git.haskell.org/ghc.git";
    inherit rev;
-    sha256 = "1c0fsk2yk08x02n6s722d36igc9prrql4wcnr8m8c62wp4yrf25z";
+    sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l";
  };

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