Merge branch 'master' into staging

Hydra: ?compare=1430035

pkgs/development/tools/build-managers/dub/default.nix

@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
+{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }:
 
 let
 
   dubBuild = stdenv.mkDerivation rec {
     name = "dubBuild-${version}";
-    version = "1.6.0";
+    version = "1.7.1";
 
     enableParallelBuilding = true;
 
@@ -12,9 +12,17 @@ let
       owner = "dlang";
       repo = "dub";
       rev = "v${version}";
-      sha256 = "1xjr5pp263lbcd4harxy1ybh7q0kzj9iyy63ji6pn66fizrgm7zk";
+      sha256 = "09bcc9bq2z1rbm8sdip1l81y5p8q13r30k02lzifyasiplrnpvlv";
     };
 
+    patches = [
+      # TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354
+      (fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/dlang/dub/pull/1354.patch";
+        sha256 = "01alky8a91qwjmlnfjbrn8kiivwr69f3j4c84cjlxrzfp1ph20ah";
+      })
+    ];
+
     postPatch = ''
       # Avoid that the version file is overwritten
       substituteInPlace build.sh \
@@ -59,6 +67,8 @@ let
     outputHash = builtins.hashString "sha256" inputString;
 
     src = dubBuild.src;
+    
+    patches = dubBuild.patches;
 
     postPatch = dubBuild.postPatch;
 

pkgs/development/tools/build-managers/gradle/default.nix

@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-4.4.1";
+    name = "gradle-4.5";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "12b3d0cyj9wdk1m6pdi3500fzvgfks8x6wgm8hf0rhyzacc7vkz7";
+      sha256 = "1qxmb4mki2gjhfwmy7lwak283l86iq3nivw57a2gpw2g64xa9wh3";
     };
   };