From d3b9df564c9097014097c79bd5c810a5d91ec00f Mon Sep 17 00:00:00 2001 From: Ate Eskola Date: Wed, 21 Aug 2024 20:12:49 +0300 Subject: [PATCH] Feat(pkgs/dmd): 2.108.1 and 2.109.1 --- pkgs/dmd/build-status.nix | 4 ++-- pkgs/dmd/generic.nix | 2 +- pkgs/dmd/supported-source-versions.json | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/dmd/build-status.nix b/pkgs/dmd/build-status.nix index 5585867b..48019384 100644 --- a/pkgs/dmd/build-status.nix +++ b/pkgs/dmd/build-status.nix @@ -116,7 +116,7 @@ let }; in mergeVersions [ - (between "2.092.0" "2.107.2" (version: { + (between "2.092.0" latestVersion (version: { x86_64-linux = { build = true; check = true; @@ -130,7 +130,7 @@ mergeVersions [ skippedTests = (getInfo version).darwinSkippedTests; }; })) - (between "2.098.0" "2.107.2" (version: { + (between "2.098.0" latestVersion (version: { x86_64-darwin = { build = true; check = true; diff --git a/pkgs/dmd/generic.nix b/pkgs/dmd/generic.nix index cd4ef8a2..87579981 100644 --- a/pkgs/dmd/generic.nix +++ b/pkgs/dmd/generic.nix @@ -291,7 +291,7 @@ stdenv.mkDerivation rec { # many tests are disbled because they are failing # NOTE: Purity check is disabled for checkPhase because it doesn't fare well # with the DMD linker. See https://github.com/NixOS/nixpkgs/issues/97420 - checkPhase = '' + checkPhase = (arg: builtins.trace arg arg) '' runHook preCheck ${lib.optionalString (buildStatus.skippedTests != [ ]) ( lib.concatMapStringsSep "\n" (test: ''rm -v ${test}'') buildStatus.skippedTests diff --git a/pkgs/dmd/supported-source-versions.json b/pkgs/dmd/supported-source-versions.json index 94a07f0e..6bf57ac4 100644 --- a/pkgs/dmd/supported-source-versions.json +++ b/pkgs/dmd/supported-source-versions.json @@ -57,5 +57,15 @@ "dmd": "sha256-byWGO13TGzx7RHkFmI2xi1PibIWBZPfvcSYX5990vak=", "phobos": "sha256-maMEdm52+4cNpHSrd48FRZzAqjmJi5ddEPM52XEnqaM=", "tools": "sha256-YEBUgJPG/+WN4MnQUNAVftZM0ULxZZzpHoOozXua46U=" + }, + "2.108.1": { + "dmd": "sha256-RQMmo+ZYp5PDD75mdsohw7XxqnTLH2FBYufqZ217ghw=", + "phobos": "sha256-Dk03koD7VvJVWXhe0nMR3MaldHhXnHoX+X93aJ19hA8=", + "tools": "sha256-YEBUgJPG/+WN4MnQUNAVftZM0ULxZZzpHoOozXua46U=" + }, + "2.109.1": { + "dmd": "sha256-3nCDPZnb4eQZmhYYxcH6qOmsP8or0KYuzAa5g/C9xdU=", + "phobos": "sha256-73I0k7tCBwe5tl4K6uMs3/nT2JTZ2SppFYzmokS4W5Y=", + "tools": "sha256-Pfj8Kwf5AlcrHhLs5A/0vIFWLZaNR3ro+esbs7oWN9I=" } }