Merge branch 'master' into staging

2016-05-08 21:24:48 +02:00
parent 62fc8859c1 6054c9f217
commit 65a9fa8cdc
245 changed files with 4326 additions and 1284 deletions
@@ -51,11 +51,11 @@ rec {
  };

  gradleLatest = gradleGen rec {
-    name = "gradle-2.12";
+    name = "gradle-2.13";

    src = fetchurl {
      url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "0p5b6dngza6c2lchz5j0w4cbsizpzvkf638yzxv09k8636c68w77";
+      sha256 = "0r5nrgrb14fi1p4cx5q5x82nghhrzdd843dsyzx6ay56lp35wrhg";
    };
  };