Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha1 = "z9dvxrkcyb4b7f2zybgkrqb9zcxrj9vi";
+    sha256 = "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch";
  };

  outputs = [ "dev" "out" ];
@@ -25,4 +25,3 @@ stdenv.mkDerivation rec {
    homepage = http://xkbcommon.org;
  };
 }
-