From 6ba002c85682c41e260067930643f3ea3a781ec1 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 1 May 2026 22:52:32 +0200
Subject: [PATCH 1/2] python3Packages.cvxpy: fix build with highs 1.14.0

Upstream PR: https://github.com/cvxpy/cvxpy/pull/3290
Hydra: https://hydra.nixos.org/build/327775858
---
 pkgs/development/python-modules/cvxpy/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index 712a4b46ede7..015f8081da51 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   numpy,
@@ -36,6 +37,15 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-MDKTuiePzqdIJlTRxbCOxoaEAisGx368iWbwKEB97QU=";
   };
 
+  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)
     ''

From b6d3924a9e6980cdf919d835082bfaec23c574de Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 1 May 2026 23:02:14 +0200
Subject: [PATCH 2/2] python3Packages.cvxpy: enable `__structuredAttrs`

---
 pkgs/development/python-modules/cvxpy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index 015f8081da51..43c49639dc2f 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -29,6 +29,7 @@ buildPythonPackage (finalAttrs: {
   pname = "cvxpy";
   version = "1.8.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "cvxpy";