From a0566251457882c5c2a33c0dfbbb2ebeaaab70fd Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer <3856390+mschwaig@users.noreply.github.com> Date: Fri, 9 May 2025 20:36:17 +0200 Subject: [PATCH] magma: remove refrences to rocmPackages_5 --- .../libraries/science/math/magma/generic.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index e68949dd3290..53407ebe7bcb 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -16,7 +16,6 @@ fetchpatch, gfortran, gpuTargets ? [ ], # Non-CUDA targets, that is HIP - rocmPackages_5 ? null, rocmPackages, lapack, lib, @@ -49,7 +48,12 @@ let inherit (effectiveCudaPackages) cudaAtLeast flags cudaOlder; effectiveRocmPackages = - if strings.versionOlder version "2.8.0" then rocmPackages_5 else rocmPackages; + if strings.versionOlder version "2.8.0" then + throw '' + the required ROCm 5.7 version for magma ${version} has been removed + '' + else + rocmPackages; # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements # of the first list *from* the second list. That means: @@ -254,6 +258,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.versionOlder version "2.8.0"); }; }