From 2480e9283aec270b8bcd1165bc2311e072d7c15b Mon Sep 17 00:00:00 2001 From: Ate Eskola Date: Mon, 25 Mar 2024 20:08:05 +0200 Subject: [PATCH] feat(pkgs/dmd): support 2.105.3, 2.106.1 and 2.107.1 --- pkgs/dmd/build-status.nix | 33 ++++++++++++++++--------- pkgs/dmd/supported-source-versions.json | 15 +++++++++++ 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/pkgs/dmd/build-status.nix b/pkgs/dmd/build-status.nix index a0a88f76..827e0537 100644 --- a/pkgs/dmd/build-status.nix +++ b/pkgs/dmd/build-status.nix @@ -89,16 +89,25 @@ let "${dmdTestDir}/runnable/test17868.d" "${dmdTestDir}/runnable/test17868b.d" ] - else if versionBetween "2.100.0" "2.105.3" version then - [ - "${dmdTestDir}/runnable/objc_class.d" - "${dmdTestDir}/runnable/objc_self_test.d" - ] - else if versionAtLeast "2.105.5" version then - [ - "${dmdTestDir}/runnable/objc_class.d" - "${dmdTestDir}/runnable/objc_self_test.d" - ] + else if versionAtLeast "2.100.0" then + if versionOlder "2.106.0" then + [ + "${dmdTestDir}/runnable/objc_class.d" + "${dmdTestDir}/runnable/objc_self_test.d" + ] + else if versionOlder "2.107.0" then + [ + "${dmdTestDir}/runnable/objc_class.d" + "${dmdTestDir}/runnable/objc_self_test.d" + "${dmdTestDir}/runnable/closure.d" + ] + else + [ + "${dmdTestDir}/runnable/objc_class.d" + "${dmdTestDir}/runnable/objc_self_test.d" + "${dmdTestDir}/runnable/closure.d" + "${dmdTestDir}/runnable/eh.d" + ] else [ ] ); @@ -107,7 +116,7 @@ let }; in mergeVersions [ - (between "2.092.0" "2.105.4" (version: { + (between "2.092.0" "2.107.2" (version: { x86_64-linux = { build = true; check = true; @@ -121,7 +130,7 @@ mergeVersions [ skippedTests = (getInfo version).darwinSkippedTests; }; })) - (between "2.098.0" "2.105.4" (version: { + (between "2.098.0" "2.107.2" (version: { x86_64-darwin = { build = true; check = true; diff --git a/pkgs/dmd/supported-source-versions.json b/pkgs/dmd/supported-source-versions.json index cfa34d25..94a07f0e 100644 --- a/pkgs/dmd/supported-source-versions.json +++ b/pkgs/dmd/supported-source-versions.json @@ -42,5 +42,20 @@ "dmd": "sha256-IjzIQZttB1711VayKDWcpYvf1MAan+GWGTdpdDTgo1k=", "phobos": "sha256-2hAq48sBC1qvS1XBWZhGIPUlsA4pGcn4pHNok6lC8R0=", "tools": "sha256-Y8jSwd6tldCnq3yEuO/xUYrSV+lp7tBPMiheMA06f0M=" + }, + "2.105.3": { + "dmd": "sha256-7MqdTnKzy3Yd7RUKn5Ef2t9x+g7zUwii1u5fU3OwAHY=", + "phobos": "sha256-2hAq48sBC1qvS1XBWZhGIPUlsA4pGcn4pHNok6lC8R0=", + "tools": "sha256-Y8jSwd6tldCnq3yEuO/xUYrSV+lp7tBPMiheMA06f0M=" + }, + "2.106.1": { + "dmd": "sha256-vjYa/Pxrz7J2htXT+fa+xaeen/Vxne++lELbHTSXBK8=", + "phobos": "sha256-yRL9ub3u4mREG9PVxBvgQ/LDXD57RadPTZ2h08qyh/s=", + "tools": "sha256-Y8jSwd6tldCnq3yEuO/xUYrSV+lp7tBPMiheMA06f0M=" + }, + "2.107.1": { + "dmd": "sha256-byWGO13TGzx7RHkFmI2xi1PibIWBZPfvcSYX5990vak=", + "phobos": "sha256-maMEdm52+4cNpHSrd48FRZzAqjmJi5ddEPM52XEnqaM=", + "tools": "sha256-YEBUgJPG/+WN4MnQUNAVftZM0ULxZZzpHoOozXua46U=" } }