Merge branch 'master' into staging

2015-08-23 10:29:12 -05:00
parent c250748a54 06717667cc
commit 90a72bd177
21 changed files with 117 additions and 67 deletions
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, jdk, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "gradle-2.2.1";
+  name = "gradle-2.6";

  src = fetchurl {
    url = "http://services.gradle.org/distributions/${name}-bin.zip";
-    sha256 = "420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418";
+    sha256 = "10ww9vqyi5jkdw5bna14y63fjfhh40n81q7qsfhdycgj19b8ra8q";
  };

  installPhase = ''