diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 007ce5b07cd..89996b3d30d 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,65 +1,96 @@
 { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
 
-stdenv.mkDerivation rec {
-  name = "dub-${version}";
-  version = "1.5.0";
+let
 
-  src = fetchFromGitHub {
-    owner = "dlang";
-    repo = "dub";
-    rev = "v${version}";
-    sha256 = "0kmirx4ijhzirjwdqmnwqhngg38zdaydpvny2p0yj3afqgkj6vq5";
+  dubBuild = stdenv.mkDerivation rec {
+    name = "dubBuild-${version}";
+    version = "1.6.0";
+
+    enableParallelBuilding = true;
+
+    src = fetchFromGitHub {
+      owner = "dlang";
+      repo = "dub";
+      rev = "v${version}";
+      sha256 = "1xjr5pp263lbcd4harxy1ybh7q0kzj9iyy63ji6pn66fizrgm7zk";
+    };
+
+    postPatch = ''
+      # Avoid that the version file is overwritten
+      substituteInPlace build.sh \
+        --replace source/dub/version_.d /dev/null
+
+      patchShebangs .
+    '';
+
+    nativeBuildInputs = [ dmd libevent rsync ];
+    buildInputs = [ curl ];
+
+    buildPhase = ''
+      export DMD=${dmd.out}/bin/dmd
+      ./build.sh
+    '';
+
+    installPhase = ''
+      mkdir $out
+      mkdir $out/bin
+      cp bin/dub $out/bin
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Package and build manager for D applications and libraries";
+      homepage = http://code.dlang.org/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ ThomasMader ];
+      platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    };
   };
 
-  postPatch = ''
-    # Avoid that the version file is overwritten
-    substituteInPlace build.sh \
-      --replace source/dub/version_.d /dev/null
+  # Need to test in a fixed-output derivation, otherwise the
+  # network tests would fail if sandbox mode is enabled.
+  dubUnittests = stdenv.mkDerivation rec {
+    name = "dubUnittests-${version}";
+    version = dubBuild.version;
 
-    substituteInPlace build.sh \
-      --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
+    enableParallelBuilding = dubBuild.enableParallelBuilding;
+    preferLocalBuild = true;
+    inputString = dubBuild.outPath;
+    outputHashAlgo = "sha256";
+    outputHash = builtins.hashString "sha256" inputString;
 
-    patchShebangs build.sh
-    patchShebangs test
+    src = dubBuild.src;
 
-    # Remove unittest which is not working for now (upstream already fixed: https://github.com/dlang/dub/issues/1224)
-    rm test/interactive-remove.sh
+    postPatch = dubBuild.postPatch;
 
-    # Fix test as long as there is no upstream solution. (see https://github.com/dlang/dub/pull/1227)
-    substituteInPlace test/issue884-init-defer-file-creation.sh \
-      --replace "< /dev/stdin" "<(while :; do sleep 1; done)" \
-      --replace "sleep 1" ""
-  '';
+    nativeBuildInputs = dubBuild.nativeBuildInputs;
+    buildInputs = dubBuild.buildInputs;
 
-  nativeBuildInputs = [ dmd libevent rsync ];
-  buildInputs = [ curl ];
-
-  buildPhase = ''
-    export DMD=${dmd.out}/bin/dmd
-    ./build.sh
-  '';
-
-  doCheck = false;
-
-  checkPhase = ''
-      export DUB=$PWD/bin/dub
+    buildPhase = ''
+      # Can't use dub from dubBuild directly because one unittest 
+      # (issue895-local-configuration) needs to generate a config 
+      # file under ../etc relative to the dub location.
+      cp ${dubBuild}/bin/dub bin/
+      export DUB=$NIX_BUILD_TOP/source/bin/dub
       export DC=${dmd.out}/bin/dmd
       export HOME=$TMP
       ./test/run-unittest.sh
-  '';
+    '';
+
+    installPhase = ''
+        echo -n $inputString > $out
+    '';
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  inherit dubUnittests;
+  name = "dub-${dubBuild.version}";
+  phases = "installPhase";
 
   installPhase = ''
     mkdir $out
-    mkdir $out/bin
-    cp bin/dub $out/bin
+    cp -r --symbolic-link ${dubBuild}/* $out/
   '';
-
-  meta = with stdenv.lib; {
-    description = "Package and build manager for D applications and libraries";
-    homepage = http://code.dlang.org/;
-    license = licenses.mit;
-    maintainers = with maintainers; [ ThomasMader ];
-    platforms = platforms.unix;
-  };
 }