From c2bd40a801ea055d0e53f7ff56783aa2912936a4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 19 May 2026 07:28:56 +0000
Subject: [PATCH] python3Packages.cvxpy: 1.8.2 -> 1.9.0

Diff: https://github.com/cvxpy/cvxpy/compare/v1.8.2...v1.9.0

Changelog: https://github.com/cvxpy/cvxpy/releases/tag/v1.9.0
---
 .../python-modules/cvxpy/default.nix          | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index 43c49639dc2f..f2b3eef531f5 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   numpy,
@@ -15,8 +14,10 @@
   cvxopt,
   highspy,
   osqp,
+  qdldl,
   scipy,
   scs,
+  sparsediffpy,
 
   # tests
   hypothesis,
@@ -27,7 +28,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cvxpy";
-  version = "1.8.2";
+  version = "1.9.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -35,18 +36,9 @@ buildPythonPackage (finalAttrs: {
     owner = "cvxpy";
     repo = "cvxpy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MDKTuiePzqdIJlTRxbCOxoaEAisGx368iWbwKEB97QU=";
+    hash = "sha256-48tczmRdNExerlVTNMuRNi1dC5XhUSXNBwIGbJ9vFnU=";
   };
 
-  patches = [
-    # Upstream PR: https://github.com/cvxpy/cvxpy/pull/3290
-    (fetchpatch {
-      name = "highs-1.14.0.patch";
-      url = "https://github.com/cvxpy/cvxpy/commit/89f8d337d927457c2e308de8295dd83f274e40e7.patch";
-      hash = "sha256-BO878Kz5ZH5FHkxZugzT+n6wjsoOReqCZWM2HDvFqAw=";
-    })
-  ];
-
   postPatch =
     # too tight tolerance in tests (AssertionError)
     ''
@@ -68,8 +60,10 @@ buildPythonPackage (finalAttrs: {
     highspy
     numpy
     osqp
+    qdldl
     scipy
     scs
+    sparsediffpy
   ];
 
   nativeCheckInputs = [
@@ -86,6 +80,11 @@ buildPythonPackage (finalAttrs: {
   enabledTestPaths = [ "cvxpy" ];
 
   disabledTests = [
+    # Numerical assertions failing
+    "test_oprelcone_1_m1_k3_real"
+    "test_oprelcone_1_m3_k1_real"
+    "test_oprelcone_1_m4_k4_real"
+
     # Disable the slowest benchmarking tests, cuts test time in half
     "test_tv_inpainting"
     "test_diffcp_sdp_example"