From 4bcce448ae87ed9ab0eb40c8a2cb5f8c132229d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Mar 2025 22:54:00 +0000 Subject: [PATCH 1/3] python312Packages.qpsolvers: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/qpsolvers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index f5a356c2f4d6..13f5492d1b6f 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; tag = "v${version}"; - hash = "sha256-/yIFLxy2gjEFg/J9A5pcbrVmq4A3Tz2efEAntH0Twk8="; + hash = "sha256-6oqCUya0ObY51zPtJl8BFK7UeX5X2SUx6p3bGQSN/gQ="; }; nativeBuildInputs = [ flit-core ]; @@ -76,7 +76,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.open_source_solvers; meta = with lib; { - changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.tag}/CHANGELOG.md"; description = "Quadratic programming solvers in Python with a unified API"; homepage = "https://github.com/qpsolvers/qpsolvers"; license = licenses.lgpl3Plus; From cef753b4b12a978ac8e9419a60cd883594ec9276 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Mar 2025 14:17:23 +0100 Subject: [PATCH 2/3] python312Packages.qpsolvers: refactor --- pkgs/development/python-modules/qpsolvers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 13f5492d1b6f..65a93580217a 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -32,11 +32,11 @@ buildPythonPackage rec { hash = "sha256-6oqCUya0ObY51zPtJl8BFK7UeX5X2SUx6p3bGQSN/gQ="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; pythonImportsCheck = [ "qpsolvers" ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy ]; From 1e9604dcc5f6d877b9b7ee490ce3a6ba7ae268e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Mar 2025 22:42:29 +0100 Subject: [PATCH 3/3] python312Packages.qpsolvers: add jaxopt --- pkgs/development/python-modules/qpsolvers/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 65a93580217a..d4ceeedd7872 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -13,6 +13,7 @@ daqp, ecos, gurobipy, + jaxopt, osqp, quadprog, scs, @@ -49,6 +50,7 @@ buildPythonPackage rec { ecos = [ ecos ]; gurobi = [ gurobipy ]; highs = [ highspy ]; + jaxopt = [ jaxopt ]; # mosek = [ cvxopt mosek ]; osqp = [ osqp ]; piqp = [ piqp ];