Merge pull request #210039 from beardhatcode/bump/dub

dub: 1.23.0 -> 1.30.0

authored by

Sandro and committed by
GitHub
14793416 4bb31740

+11 -10
+11 -10
pkgs/development/tools/build-managers/dub/default.nix
··· 4 4 5 5 stdenv.mkDerivation rec { 6 6 pname = "dub"; 7 - version = "1.23.0"; 7 + version = "1.30.0"; 8 8 9 9 enableParallelBuilding = true; 10 10 ··· 12 12 owner = "dlang"; 13 13 repo = "dub"; 14 14 rev = "v${version}"; 15 - sha256 = "06a4whsl1m600k096nwif83n7za3vr7pj1xwapncy5fcad1gmady"; 15 + sha256 = "sha256-iVl7bjblvIxvrUX7Phq6h4AIAmZjNVkGYYFA1hhsE7c="; 16 16 }; 17 17 18 - postUnpack = '' 19 - patchShebangs . 20 - ''; 21 - 22 - # Can be removed with https://github.com/dlang/dub/pull/1368 23 18 dubvar = "\\$DUB"; 24 19 postPatch = '' 25 - substituteInPlace test/fetchzip.sh \ 26 - --replace "dub remove" "\"${dubvar}\" remove" 20 + patchShebangs test 21 + 22 + 23 + # Can be removed with https://github.com/dlang/dub/pull/1368 24 + substituteInPlace test/fetchzip.sh \ 25 + --replace "dub remove" "\"${dubvar}\" remove" 27 26 ''; 28 27 29 28 nativeBuildInputs = [ dcompiler libevent rsync ]; ··· 50 49 checkPhase = '' 51 50 export DUB=$NIX_BUILD_TOP/source/bin/dub 52 51 export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ 53 - export DC=${dcompiler.out}/bin/${dcompiler.pname} 52 + export DC=${dcompiler.out}/bin/${if dcompiler.pname=="ldc" then "ldc2" else dcompiler.pname} 54 53 echo "DC out --> $DC" 55 54 export HOME=$TMP 56 55 ··· 103 102 rm test/single-file-sdl-default-name.sh 104 103 rm test/subpackage-common-with-sourcefile-globbing.sh 105 104 rm test/issue934-path-dep.sh 105 + rm -r test/issue2258-dynLib-exe-dep # requires files below 106 106 rm -r test/1-dynLib-simple 107 107 rm -r test/1-exec-simple-package-json 108 108 rm -r test/1-exec-simple ··· 136 136 rm -r test/issue97-targettype-none-onerecipe 137 137 rm -r test/path-subpackage-ref 138 138 rm -r test/sdl-package-simple 139 + rm -r test/dpath-variable # requires execution of dpath-variable.sh 139 140 140 141 ./test/run-unittest.sh 141 142 '';