From 2df1ba87c6a90eedfaa1a759408795eb87dbaceb Mon Sep 17 00:00:00 2001 From: Joseph Fox-Rabinovitz Date: Mon, 31 Aug 2026 17:39:09 -0500 Subject: [PATCH] python3Packages.control: fix build with matplotlib 3.11 and numpy 2.5 --- .../development/python-modules/control/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/control/default.nix b/pkgs/development/python-modules/control/default.nix index 31c77c2d3291..599d6f68c0ce 100644 --- a/pkgs/development/python-modules/control/default.nix +++ b/pkgs/development/python-modules/control/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, cvxopt, fetchFromGitHub, + fetchpatch, matplotlib, numpy, numpydoc, @@ -25,6 +26,19 @@ buildPythonPackage rec { hash = "sha256-E9RZDUK01hzjutq83XdLr3d97NwjmQzt65hqVg2TBGE="; }; + patches = [ + # matplotlib >= 3.11 no longer warns when tight layout is not applied + (fetchpatch { + url = "https://github.com/python-control/python-control/commit/3b70cb41b5d41ed4aa4da9f2db2eb3d83c3ffdcd.patch"; + hash = "sha256-zJAbgbeiYQlglG/mbtREvs7AFxwGxzlzrr0iuKPHp5I="; + }) + # numpy >= 2.5 deprecates assigning to .shape + (fetchpatch { + url = "https://github.com/python-control/python-control/commit/ae4915c4ece5f417fa514dadeb0d30ab412a28aa.patch"; + hash = "sha256-Z5U9sgtlp35bHYOYC2ag9007fGVXwzhTgBQN7yLsjCI="; + }) + ]; + build-system = [ setuptools setuptools-scm