Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 200e016e82af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20d7561a460b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 7, 2018

  1. ldc: 1.7.0 -> 1.8.0

    @ThomasMader
    ThomasMader committed Mar 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    be8c9af View commit details

Commits on Apr 9, 2018

  1. Merge pull request #36448 from ThomasMader/dlang-update 

    ldc: 1.7.0 -> 1.8.0
    @matthewbauer
    matthewbauer authored Apr 9, 2018
    Copy the full SHA
    20d7561 View commit details
Showing with 12 additions and 14 deletions.
  1. +12 −14 pkgs/development/compilers/ldc/default.nix
26 changes: 12 additions & 14 deletions pkgs/development/compilers/ldc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@
, python, libconfig, lit, gdb, unzip, darwin, bash
, callPackage
, bootstrapVersion ? false
, version ? "1.7.0"
, ldcSha256 ? "1g8qvmlzvsp030z2rw6lis4kclsd9mlmnbim5kas0k1yr9063m3w"
, version ? "1.8.0"
, ldcSha256 ? "0zswjlibj8zcdj06nn09jjhbd99chsa5f4kps8xifzgrpgsa28g4"
}:

let
@@ -29,16 +29,12 @@ let
sha256 = ldcSha256;
};

sourceRoot = ".";

postUnpack = ''
cd ldc-${version}-src/
patchShebangs .
# Remove cppa test for now because it doesn't work.
rm tests/d2/dmd-testsuite/runnable/cppa.d
rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp
''

+ stdenv.lib.optionalString (bootstrapVersion) ''
@@ -55,12 +51,15 @@ let
#
#==============================
#Test failed: expected rc == 0, exited with rc == 1
rm tests/d2/dmd-testsuite/runnable/variadic.d
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/variadic.d
''

+ stdenv.lib.optionalString (!bootstrapVersion) ''
# http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org
rm -r tests/dynamiccompile
rm -r ldc-${version}-src/tests/dynamiccompile
# https://github.com/NixOS/nixpkgs/issues/34817
rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
'';

ROOT_HOME_DIR = "$(echo ~root)";
@@ -190,8 +189,6 @@ let

src = ldcBuild.src;

sourceRoot = ".";

postUnpack = ldcBuild.postUnpack;

postPatch = ldcBuild.postPatch;
@@ -212,7 +209,7 @@ let
"-DLDC_WITH_LLD=OFF"
# Xcode 9.0.1 fixes that bug according to ldc release notes
"-DRT_ARCHIVE_WITH_LDC=OFF"
"-DD_COMPILER=${ldcBuild}/bin/ldmd2"
"-DD_COMPILER=${ldcBuild.out}/bin/ldmd2"
)
'';

@@ -223,7 +220,7 @@ let
buildCmd = if bootstrapVersion then
"ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\""
else
"make -j$NIX_BUILD_CORES DMD=${ldcBuild}/bin/ldc2 druntime-test-runner druntime-test-runner-debug 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
"ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\""
@@ -232,6 +229,7 @@ let

buildPhase = ''
${buildCmd}
ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2
${testCmd}
'';