Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
parent c979012631 53e0f8b1cd
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
@@ -119,5 +119,4 @@ mkDerivation (rec {
  license = stdenv.lib.licenses.bsd3;
  platforms = ghc.meta.platforms;
  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-  broken = true; # depends on outdated versions of its Haskell build inputs
 })
@@ -2,6 +2,6 @@
 fetchFromGitHub {
  owner = "ghcjs";
  repo = "shims";
-  rev = "09e37565df8bbf876d4b7f36fbc19aa2140844a7";
-  sha256 = "000ds78pv56v4drbdx3y7xncx9224l28n7cal9gy3inns1mq6yhj";
+  rev = "45f44f5f027ec03264b61b8049951e765cc0b23a";
+  sha256 = "090pz4rzwlcrjavbbzxhf6c7rq7rzmr10g89hmhw4c65c4fyyykp";
 }