From 559f172e477b94effbfaa4473222196515fcc7c7 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 17 Jan 2025 17:11:46 +0100
Subject: [PATCH 1/2] python3Packages.qpsolvers: add proxsuite

---
 pkgs/development/python-modules/qpsolvers/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix
index f1b7a77e6367..f5a356c2f4d6 100644
--- a/pkgs/development/python-modules/qpsolvers/default.nix
+++ b/pkgs/development/python-modules/qpsolvers/default.nix
@@ -18,6 +18,7 @@
   scs,
   highspy,
   piqp,
+  proxsuite,
 }:
 buildPythonPackage rec {
   pname = "qpsolvers";
@@ -51,7 +52,7 @@ buildPythonPackage rec {
     # mosek = [ cvxopt mosek ];
     osqp = [ osqp ];
     piqp = [ piqp ];
-    # proxqp = [ proxsuite ];
+    proxqp = [ proxsuite ];
     # qpalm = [ qpalm ];
     quadprog = [ quadprog ];
     scs = [ scs ];
@@ -64,7 +65,9 @@ buildPythonPackage rec {
         ecos
         highs
         osqp
-        piqp # proxqp qpalm
+        piqp
+        proxqp
+        # qpalm
         quadprog
         scs
       ];

From 20e53fbc3b2a9b8b228a0f9e3de27bdc8f6482c0 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 14 Feb 2025 11:13:00 +0100
Subject: [PATCH 2/2] python3Packages.pipq: fix on darwin

---
 pkgs/development/python-modules/piqp/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/piqp/default.nix b/pkgs/development/python-modules/piqp/default.nix
index 22ab19aa442c..5abc64e982ee 100644
--- a/pkgs/development/python-modules/piqp/default.nix
+++ b/pkgs/development/python-modules/piqp/default.nix
@@ -40,7 +40,10 @@ buildPythonPackage rec {
         "${major python.pythonVersion}${minor python.pythonVersion}";
 
       # E.g. "linux-aarch64"
-      platform = with stdenv.hostPlatform.parsed; "${kernel.name}-${cpu.name}";
+      platform =
+        with stdenv.hostPlatform;
+        (lib.optionalString (!isDarwin) "${parsed.kernel.name}-${parsed.cpu.name}")
+        + (lib.optionalString isDarwin "macosx-${darwinMinVersion}-${darwinArch}");
     in
     ''
       build="build/temp.${platform}-cpython-${pythonVersionMajorMinor}/${pname}.${pname}"