diff options
Diffstat (limited to 'pkgs/development/compilers/dmd')
-rw-r--r-- | pkgs/development/compilers/dmd/default.nix | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 074646f5f416a..51f30dbabdaf8 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -4,10 +4,10 @@ , targetPackages, fetchpatch, bash , dmdBootstrap ? callPackage ./bootstrap.nix { } , HOST_DMD ? "${dmdBootstrap}/bin/dmd" -, version ? "2.091.1" -, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr" -, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl" -, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs" +, version ? "2.095.1" +, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk" +, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha" +, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl" }: let @@ -53,18 +53,6 @@ stdenv.mkDerivation rec { }) ]; - patchFlags = [ "--directory=dmd" "-p1" "-F3" ]; - patches = [ - (fetchpatch { - url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch"; - sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2"; - }) - (fetchpatch { - url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch"; - sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs"; - }) - ]; - sourceRoot = "."; # https://issues.dlang.org/show_bug.cgi?id=19553 @@ -76,6 +64,16 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" + + rm dmd/test/runnable/gdb1.d + rm dmd/test/runnable/gdb10311.d + rm dmd/test/runnable/gdb14225.d + rm dmd/test/runnable/gdb14276.d + rm dmd/test/runnable/gdb14313.d + rm dmd/test/runnable/gdb14330.d + rm dmd/test/runnable/gdb15729.sh + rm dmd/test/runnable/gdb4149.d + rm dmd/test/runnable/gdb4181.d '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" @@ -171,5 +169,7 @@ stdenv.mkDerivation rec { license = licenses.boost; maintainers = with maintainers; [ ThomasMader lionello ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + # many tests are failing + broken = true; }; } |