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

ldc: 1.8.0 -> 1.10.0

Browse Source 
Disabled tests on Darwin for now
This commit is contained in:
Thomas Mader 2018-08-11 13:50:43 +02:00
parent b92956d4c6
commit f4f488de21
1 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
pkgs/development/compilers/ldc/default.nix
View File

@ -2,8 +2,8 @@
, python, libconfig, lit, gdb, unzip, darwin, bash , python, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, targetPackages , callPackage, makeWrapper, targetPackages
, bootstrapVersion ? false , bootstrapVersion ? false
, version ? "1.8.0" , version ? "1.10.0"
, ldcSha256 ? "0zswjlibj8zcdj06nn09jjhbd99chsa5f4kps8xifzgrpgsa28g4" , ldcSha256 ? "0wc3vlblsz4qdwa9ay9plv9nvfd07zj2byqqffaa4a5gvjwf5dlr"
}: }:
let let
@ -155,7 +155,10 @@ let
makeFlags = [ "DMD=$DMD" ]; makeFlags = [ "DMD=$DMD" ];
doCheck = true; # Disable tests on Darwin for now because of
# https://github.com/NixOS/nixpkgs/issues/41099
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
doCheck = !bootstrapVersion && !stdenv.hostPlatform.isDarwin;
checkPhase = '' checkPhase = ''
# Build and run LDC D unittests. # Build and run LDC D unittests.
@ -184,65 +187,72 @@ let
# Need to test Phobos in a fixed-output derivation, otherwise the # Need to test Phobos in a fixed-output derivation, otherwise the
# network stuff in Phobos would fail if sandbox mode is enabled. # network stuff in Phobos would fail if sandbox mode is enabled.
ldcUnittests = stdenv.mkDerivation rec { #
name = "ldcUnittests-${version}"; # Disable tests on Darwin for now because of
# https://github.com/NixOS/nixpkgs/issues/41099
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
ldcUnittests = if (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) then
stdenv.mkDerivation rec {
name = "ldcUnittests-${version}";
enableParallelBuilding = ldcBuild.enableParallelBuilding; enableParallelBuilding = ldcBuild.enableParallelBuilding;
preferLocalBuild = true; preferLocalBuild = true;
inputString = ldcBuild.outPath; inputString = ldcBuild.outPath;
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = builtins.hashString "sha256" inputString; outputHash = builtins.hashString "sha256" inputString;
src = ldcBuild.src; src = ldcBuild.src;
postUnpack = ldcBuild.postUnpack; postUnpack = ldcBuild.postUnpack;
postPatch = ldcBuild.postPatch; postPatch = ldcBuild.postPatch;
nativeBuildInputs = ldcBuild.nativeBuildInputs nativeBuildInputs = ldcBuild.nativeBuildInputs
++ [ ++ [
ldcBuild ldcBuild
]; ];
buildInputs = ldcBuild.buildInputs; buildInputs = ldcBuild.buildInputs;
preConfigure = '' preConfigure = ''
cmakeFlagsArray=( "-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" cmakeFlagsArray=( "-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_SKIP_RPATH=ON" "-DCMAKE_SKIP_RPATH=ON"
"-DBUILD_SHARED_LIBS=OFF" "-DBUILD_SHARED_LIBS=OFF"
"-DLDC_WITH_LLD=OFF" "-DLDC_WITH_LLD=OFF"
# Xcode 9.0.1 fixes that bug according to ldc release notes # Xcode 9.0.1 fixes that bug according to ldc release notes
"-DRT_ARCHIVE_WITH_LDC=OFF" "-DRT_ARCHIVE_WITH_LDC=OFF"
"-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2"
) )
''; '';
postConfigure = ldcBuild.postConfigure; postConfigure = ldcBuild.postConfigure;
makeFlags = ldcBuild.makeFlags; makeFlags = ldcBuild.makeFlags;
buildCmd = if bootstrapVersion then buildCmd = if bootstrapVersion then
"ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\""
else else
"make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug";
testCmd = if bootstrapVersion then testCmd = if bootstrapVersion then
"ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\""
else else
"ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\"";
buildPhase = '' buildPhase = ''
${buildCmd} ${buildCmd}
ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2
${testCmd} ${testCmd}
''; '';
installPhase = '' installPhase = ''
echo -n $inputString > $out echo -n $inputString > $out
''; '';
}; }
else
"";
in in