git.iko.soy/typeable/nixpkgs
on master help sign in
dmd: 2.091.1 -> 2.095.1
commit7e05c5806990eb54ed45c0c9ba512fc5e296e0fa authorThomas Mader <thomas.mader@gmail.com> dateSat 6 Mar 2021, 17:01 (6 years ago) parentcb319c2
1 file changed+14−16
pkgs/development/compilers/dmd/default.nix+14−16
pkgs/development/compilers/dmd/default.nix+14−16
@@ -4,10 +4,10 @@
44, targetPackages, fetchpatch, bash
55, dmdBootstrap ? callPackage ./bootstrap.nix { }
66, HOST_DMD ? "${dmdBootstrap}/bin/dmd"
7−, version ? "2.091.1"
8−, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr"
9−, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl"
10−, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs"
7+, version ? "2.095.1"
8+, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk"
9+, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha"
10+, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl"
1111}:
1212
1313let
@@ -53,18 +53,6 @@ stdenv.mkDerivation rec {
5353 })
5454 ];
5555
56− patchFlags = [ "--directory=dmd" "-p1" "-F3" ];
57− patches = [
58− (fetchpatch {
59− url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch";
60− sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2";
61− })
62− (fetchpatch {
63− url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch";
64− sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs";
65− })
66− ];
67−
6856 sourceRoot = ".";
6957
7058 # https://issues.dlang.org/show_bug.cgi?id=19553
@@ -76,6 +64,16 @@ stdenv.mkDerivation rec {
7664
7765 postPatch = ''
7866 substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
67+
68+ rm dmd/test/runnable/gdb1.d
69+ rm dmd/test/runnable/gdb10311.d
70+ rm dmd/test/runnable/gdb14225.d
71+ rm dmd/test/runnable/gdb14276.d
72+ rm dmd/test/runnable/gdb14313.d
73+ rm dmd/test/runnable/gdb14330.d
74+ rm dmd/test/runnable/gdb15729.sh
75+ rm dmd/test/runnable/gdb4149.d
76+ rm dmd/test/runnable/gdb4181.d
7977 ''
8078 + lib.optionalString stdenv.hostPlatform.isLinux ''
8179 substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""