From 5957cf94ee00cf1e30f7df5fc42aaaf334aa83b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 7 Apr 2026 05:35:18 +0200 Subject: [PATCH 1/2] suitesparse: remove ? null, remove empty list --- .../science/math/suitesparse/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index d9ae4221d718..4cb0c4260e6c 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -12,7 +12,7 @@ config, enableCuda ? config.cudaSupport, cudaPackages, - openmp ? null, + llvmPackages, }@inputs: let @@ -36,14 +36,13 @@ effectiveStdenv.mkDerivation rec { sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8="; }; - nativeBuildInputs = [ - ] - ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ - fixDarwinDylibNames - ] - ++ lib.optionals enableCuda [ - cudaPackages.cuda_nvcc - ]; + nativeBuildInputs = + lib.optionals effectiveStdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ] + ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc + ]; # Use compatible indexing for lapack and blas used buildInputs = @@ -57,7 +56,7 @@ effectiveStdenv.mkDerivation rec { mpfr ] ++ lib.optionals effectiveStdenv.cc.isClang [ - openmp + llvmPackages.openmp ] ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c6306892b86..137e33c59f98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11627,9 +11627,7 @@ with pkgs; lapack = lapack-ilp64; }; - suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse { - inherit (llvmPackages) openmp; - }; + suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse { }; suitesparse = suitesparse_5_3; trilinos-mpi = trilinos.override { withMPI = true; }; From c6601ac24b9e8450634c66e0bf403a8a45c58f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 8 Apr 2026 02:36:34 +0200 Subject: [PATCH 2/2] suitesparse_5_3: drop alias --- pkgs/top-level/all-packages.nix | 3 +-- pkgs/top-level/release-alternatives.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 137e33c59f98..e3d15c568913 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11627,8 +11627,7 @@ with pkgs; lapack = lapack-ilp64; }; - suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse { }; - suitesparse = suitesparse_5_3; + suitesparse = callPackage ../development/libraries/science/math/suitesparse { }; trilinos-mpi = trilinos.override { withMPI = true; }; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index d988265f7735..2b8e9c37daf8 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -18,7 +18,7 @@ let "rspamd" "octopus" "superlu" - "suitesparse_5_3" + "suitesparse" "scs" "scalapack" "petsc" @@ -94,7 +94,7 @@ let blas64Users = [ "rspamd" "sundials" - "suitesparse_5_3" + "suitesparse" "petsc" "cholmod-extra" "arpack"