From f6cab26a11dd6fe621ce2e399e3211754c39d5e7 Mon Sep 17 00:00:00 2001
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
Date: Fri, 17 Nov 2023 21:06:05 +0000
Subject: python311Packages.scs: add BLAS & LAPACK env vars; fix build

after numpy updated to 1.26.1 distutils no longer provides the lib
locations so use env vars for non-darwin. On darwin Accelerate library
is prioritized over BLAS so add Accelerate to buildInputs.
---
 pkgs/development/python-modules/scs/default.nix | 14 ++++++++++++--
 pkgs/top-level/python-packages.nix              |  4 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix
index 0a242e23137..fdad7daec2d 100644
--- a/pkgs/development/python-modules/scs/default.nix
+++ b/pkgs/development/python-modules/scs/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
+, Accelerate
 , blas
 , lapack
 , numpy
@@ -22,9 +23,18 @@ buildPythonPackage rec {
     fetchSubmodules = true;
   };
 
-  buildInputs = [
-    lapack
+  env = lib.optionalAttrs (!stdenv.isDarwin) {
+    # provide lib locations in env vars as numpy distutils 1.26.1 and later
+    # does not
+    BLAS   = lib.getLib blas;
+    LAPACK = lib.getLib lapack;
+  };
+
+  buildInputs = if stdenv.isDarwin then [
+    Accelerate
+  ] else [
     blas
+    lapack
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 13bd7d07d53..4b29edee0ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12683,7 +12683,9 @@ self: super: with self; {
 
   scikit-survival = callPackage ../development/python-modules/scikit-survival { };
 
-  scs = callPackage ../development/python-modules/scs { };
+  scs = callPackage ../development/python-modules/scs {
+    inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate;
+  };
 
   sdds = callPackage ../development/python-modules/sdds { };
 
-- 
cgit 1.4.1


From eb942c46f774d4e12077db4a2c2c8d6d5ca951e5 Mon Sep 17 00:00:00 2001
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
Date: Sat, 18 Nov 2023 23:32:15 +0000
Subject: maintainers: add a-n-n-a-l-e-e

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 399bff49f69..681aacd048a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1225,6 +1225,11 @@
     githubId = 81317317;
     name = "Anna Aurora";
   };
+  a-n-n-a-l-e-e = {
+    github = "a-n-n-a-l-e-e";
+    githubId = 150648636;
+    name = "annalee";
+  };
   anoa = {
     matrix = "@andrewm:amorgan.xyz";
     email = "andrew@amorgan.xyz";
-- 
cgit 1.4.1


From 4da393a64ecab30cd67c59c7e85ed5d3c8e276f5 Mon Sep 17 00:00:00 2001
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
Date: Sat, 18 Nov 2023 10:07:58 +0000
Subject: python311Packages.scs: 3.2.3 -> 3.2.4

---
 pkgs/development/python-modules/scs/default.nix | 36 ++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix
index fdad7daec2d..5e95bed4cbd 100644
--- a/pkgs/development/python-modules/scs/default.nix
+++ b/pkgs/development/python-modules/scs/default.nix
@@ -2,6 +2,9 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
+, meson-python
+, pkg-config
 , Accelerate
 , blas
 , lapack
@@ -13,22 +16,37 @@
 
 buildPythonPackage rec {
   pname = "scs";
-  version = "3.2.3";
+  version = "3.2.4";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bodono";
     repo = "scs-python";
     rev = version;
-    hash = "sha256-/5yGvZy3luGQkbYcsb/6TZLYou91lpA3UKONviMVpuM=";
+    hash = "sha256-UmMbnj7QZSvHWSUk1Qa0VP4i3iDCYHxoa+qBmEdFjRs=";
     fetchSubmodules = true;
   };
 
-  env = lib.optionalAttrs (!stdenv.isDarwin) {
-    # provide lib locations in env vars as numpy distutils 1.26.1 and later
-    # does not
-    BLAS   = lib.getLib blas;
-    LAPACK = lib.getLib lapack;
-  };
+  patches = [
+    # needed for building against netlib's reference blas implementation and
+    # the pkg-config patch. remove on next update
+    (fetchpatch {
+      name = "find-and-ld-lapack.patch";
+      url = "https://github.com/bodono/scs-python/commit/a0aea80e7d490770d6a47d2c79396f6c3341c1f9.patch";
+      hash = "sha256-yHF8f7SLoG7veZ6DEq1HVH6rT2KtFONwJtqSiKcxOdg=";
+    })
+    # add support for pkg-config. remove on next update
+    (fetchpatch {
+      name = "use-pkg-config.patch";
+      url = "https://github.com/bodono/scs-python/commit/dd17e2e5282ebe85f2df8a7c6b25cfdeb894970d.patch";
+      hash = "sha256-vSeSJeeu5Wx3RXPyB39YTo0RU8HtAojrUw85Q76/QzA=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    meson-python
+    pkg-config
+  ];
 
   buildInputs = if stdenv.isDarwin then [
     Accelerate
@@ -61,6 +79,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/cvxgrp/scs"; # upstream C package
     downloadPage = "https://github.com/bodono/scs-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ drewrisinger ];
+    maintainers = with maintainers; [ a-n-n-a-l-e-e drewrisinger ];
   };
 }
-- 
cgit 1.4.1