From 5880fc5bf12e88e8e1b5ce60a108d0aaa5b4f291 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 14 Apr 2025 17:18:01 +0200 Subject: [PATCH 1/2] adaptivecpp: remove no longer necessary rocmPackages version check because now we have ROCm 6.3.3 --- pkgs/by-name/ad/adaptivecpp/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ad/adaptivecpp/package.nix b/pkgs/by-name/ad/adaptivecpp/package.nix index 909a4bafc375..5949c7e91f5f 100644 --- a/pkgs/by-name/ad/adaptivecpp/package.nix +++ b/pkgs/by-name/ad/adaptivecpp/package.nix @@ -167,9 +167,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Multi-backend implementation of SYCL for CPUs and GPUs"; mainProgram = "acpp"; maintainers = with maintainers; [ yboettcher ]; - # Broken with current nixpkgs ROCm 6.0.2 - # Works with updated ROCm, see https://github.com/NixOS/nixpkgs/pull/367695 - broken = rocmSupport && strings.versionOlder rocmPackages.clr.version "6.3.1"; license = licenses.bsd2; }; }) From 531cc317c408899acc0acb72f654e9e0e560ed1d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 14 Apr 2025 17:19:27 +0200 Subject: [PATCH 2/2] magma: remove no longer necessary rocmPackages version check because now we have ROCm 6.3.3 --- pkgs/development/libraries/science/math/magma/generic.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index ff3cab98b4f7..e68949dd3290 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -254,11 +254,6 @@ stdenv.mkDerivation { || !(cudaSupport || rocmSupport) # At least one back-end enabled || (cudaSupport && rocmSupport) # Mutually exclusive || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null) - || (rocmSupport && strings.versionOlder version "2.8.0" && rocmPackages_5 == null) - || ( - rocmSupport - && strings.versionAtLeast version "2.8.0" - && strings.versionOlder rocmPackages.clr.version "6.3" - ); + || (rocmSupport && strings.versionOlder version "2.8.0" && rocmPackages_5 == null); }; }