JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dub: 1.8.1 -> 1.10.0

Browse Source
This commit is contained in:
Thomas Mader 2018-08-11 15:25:01 +02:00
parent 6301b09eaa
commit c685f15dc2
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pkgs/development/tools/build-managers/dub/default.nix
View File

@ -4,7 +4,7 @@ let
dubBuild = stdenv.mkDerivation rec { dubBuild = stdenv.mkDerivation rec {
name = "dubBuild-${version}"; name = "dubBuild-${version}";
version = "1.8.1"; version = "1.10.0";
enableParallelBuilding = true; enableParallelBuilding = true;
@ -12,7 +12,7 @@ let
owner = "dlang"; owner = "dlang";
repo = "dub"; repo = "dub";
rev = "v${version}"; rev = "v${version}";
sha256 = "16r7x4jsfv5fjssvs6mwj8ymr6fjpvbkjhpr4f4368sjr5iyfad6"; sha256 = "02xxpfcjs427jqbwz0vh5vl3bh62ys65zmi9gpa3svzqffyx13n4";
}; };
postUnpack = '' postUnpack = ''
@ -51,40 +51,45 @@ let
# Need to test in a fixed-output derivation, otherwise the # Need to test in a fixed-output derivation, otherwise the
# network tests would fail if sandbox mode is enabled. # network tests would fail if sandbox mode is enabled.
dubUnittests = stdenv.mkDerivation rec { # Disable tests on Darwin for now because they don't work
name = "dubUnittests-${version}"; # reliably there.
version = dubBuild.version; dubUnittests = if !stdenv.hostPlatform.isDarwin then
stdenv.mkDerivation rec {
name = "dubUnittests-${version}";
version = dubBuild.version;
enableParallelBuilding = dubBuild.enableParallelBuilding; enableParallelBuilding = dubBuild.enableParallelBuilding;
preferLocalBuild = true; preferLocalBuild = true;
inputString = dubBuild.outPath; inputString = dubBuild.outPath;
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = builtins.hashString "sha256" inputString; outputHash = builtins.hashString "sha256" inputString;
src = dubBuild.src; src = dubBuild.src;
postUnpack = dubBuild.postUnpack; postUnpack = dubBuild.postUnpack;
postPatch = dubBuild.postPatch; postPatch = dubBuild.postPatch;
nativeBuildInputs = dubBuild.nativeBuildInputs; nativeBuildInputs = dubBuild.nativeBuildInputs;
buildInputs = dubBuild.buildInputs; buildInputs = dubBuild.buildInputs;
buildPhase = '' buildPhase = ''
# Can't use dub from dubBuild directly because one unittest # Can't use dub from dubBuild directly because one unittest
# (issue895-local-configuration) needs to generate a config # (issue895-local-configuration) needs to generate a config
# file under ../etc relative to the dub location. # file under ../etc relative to the dub location.
cp ${dubBuild}/bin/dub bin/ cp ${dubBuild}/bin/dub bin/
export DUB=$NIX_BUILD_TOP/source/bin/dub export DUB=$NIX_BUILD_TOP/source/bin/dub
export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
export DC=${dmd.out}/bin/dmd export DC=${dmd.out}/bin/dmd
export HOME=$TMP export HOME=$TMP
./test/run-unittest.sh ./test/run-unittest.sh
''; '';
installPhase = '' installPhase = ''
echo -n $inputString > $out echo -n $inputString > $out
''; '';
}; }
else
"";
in in