Merge master into closure-size

The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
parent f306e67e15 0ee75214f3
commit 09af15654f
1276 changed files with 78548 additions and 29166 deletions
@@ -11,7 +11,7 @@ assert wantPS -> (ps != null);
 let
  os = stdenv.lib.optionalString;
  majorVersion = "3.4";
-  minorVersion = "0";
+  minorVersion = "3";
  version = "${majorVersion}.${minorVersion}";
 in

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1shwim3gfdybjx9f11ykxz5l09rh58vmvz8ip76q3i76mkv2pf55";
+    sha256 = "1yl0z422gr7zfc638chifv343vx0ig5gasvrh7nzf7b15488qgxp";
  };

  patches =