From c275e75b198ee621cbfcc7224d5e36ef903b3f8e Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 11 Dec 2023 16:32:23 +1300 Subject: [PATCH 1/2] dmd: 2.105.2 -> 2.106.0 --- pkgs/development/compilers/dmd/default.nix | 6 +++--- pkgs/development/compilers/dmd/generic.nix | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index f73804874cc6..59a8ad8c63c6 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -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="; } diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index 0f6abb574a59..5cf07454141b 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -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" From c37d28c293a822bc1120e2391ff200651ea1d2d7 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 11 Dec 2023 17:33:32 +1300 Subject: [PATCH 2/2] dtools: 2.105.2 -> 2.106.0 --- pkgs/development/tools/dtools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 4d64760d39ff..5b525f3067f2 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "dtools"; - version = "2.105.2"; + version = "2.106.0"; src = fetchFromGitHub { owner = "dlang";