3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #273478 from jtbx/dmd+dtools-2.106.0

dmd, dtools: 2.105.2 -> 2.106.0
This commit is contained in:
Weijia Wang 2023-12-11 16:20:26 +01:00 committed by GitHub
commit cc4c44de5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 10 deletions

View file

@ -1,5 +1,5 @@
import ./generic.nix {
version = "2.105.2";
dmdSha256 = "sha256-IjzIQZttB1711VayKDWcpYvf1MAan+GWGTdpdDTgo1k=";
phobosSha256 = "sha256-2hAq48sBC1qvS1XBWZhGIPUlsA4pGcn4pHNok6lC8R0=";
version = "2.106.0";
dmdSha256 = "sha256-H28X+8qAjnc5KIvZ7HRVCtjNpf1hBwSPL6QIVeWCjKM=";
phobosSha256 = "sha256-umsPMQbomJUu/QBMSgSC0jEajxiJwv1Lay4q4tvfnsI=";
}

View file

@ -96,6 +96,7 @@ stdenv.mkDerivation rec {
rm dmd/compiler/test/runnable/gdb15729.sh
rm dmd/compiler/test/runnable/gdb4149.d
rm dmd/compiler/test/runnable/gdb4181.d
rm dmd/compiler/test/compilable/ddocYear.d
# Disable tests that rely on objdump whitespace until fixed upstream:
# https://issues.dlang.org/show_bug.cgi?id=23317
@ -103,12 +104,7 @@ stdenv.mkDerivation rec {
rm dmd/compiler/test/compilable/cdcmp.d
''
+ lib.optionalString (lib.versionOlder version "2.091.0") ''
# This one has tested against a hardcoded year, then against a current year on
# and off again. It just isn't worth it to patch all the historical versions
# of it, so just remove it until the most recent change.
rm dmd/compiler/test/compilable/ddocYear.d
'' + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") ''
+ lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") ''
rm dmd/compiler/test/dshell/test6952.d
'' + lib.optionalString (lib.versionAtLeast version "2.092.2") ''
substituteInPlace dmd/compiler/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "dtools";
version = "2.105.2";
version = "2.106.0";
src = fetchFromGitHub {
owner = "dlang";