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

20
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,7 +187,12 @@ 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 { #
# 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}"; name = "ldcUnittests-${version}";
enableParallelBuilding = ldcBuild.enableParallelBuilding; enableParallelBuilding = ldcBuild.enableParallelBuilding;
@ -242,7 +250,9 @@ let
installPhase = '' installPhase = ''
echo -n $inputString > $out echo -n $inputString > $out
''; '';
}; }
else
"";
in in