treewide: use blas and lapack

This makes packages use lapack and blas, which can wrap different
BLAS/LAPACK implementations.

treewide: cleanup from blas/lapack changes

A few issues in the original treewide:

- can’t assume blas64 is a bool
- unused commented code

1 files changed, 9 insertions, 14 deletions

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 8301dcd49b83..04340ac4e89f 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -275,20 +275,15 @@ self: super:
     old:
       let
         blas = old.passthru.args.blas or pkgs.openblasCompat;
-        blasImplementation = lib.nameFromURL blas.name "-";
+        lapack = old.passthru.args.lapack or pkgs.openblasCompat;
         cfg = pkgs.writeTextFile {
           name = "site.cfg";
-          text = (
-            lib.generators.toINI {} {
-              ${blasImplementation} = {
-                include_dirs = "${blas}/include";
-                library_dirs = "${blas}/lib";
-              } // lib.optionalAttrs (blasImplementation == "mkl") {
-                mkl_libs = "mkl_rt";
-                lapack_libs = "";
-              };
-            }
-          );
+          text = (lib.generators.toINI {} {
+            ${blas.implementation} = {
+              include_dirs = "${blas}/include:${lapack}/include";
+              library_dirs = "${blas}/lib:${lapack}/lib";
+            };
+          });
         };
       in
         {
@@ -299,8 +294,8 @@ self: super:
             ln -s ${cfg} site.cfg
           '';
           passthru = old.passthru // {
-            blas = blas;
-            inherit blasImplementation cfg;
+            blsaImplementation = blas.implementation;
+            inherit blas cfg;
           };
         }
   );