From 0bd247ffb5a539a71e984fba5632bbb053a671d1 Mon Sep 17 00:00:00 2001 From: Peter3579 <170885528+Peter3579@users.noreply.github.com> Date: Mon, 16 Jun 2025 12:28:24 +0200 Subject: [PATCH 1/2] maintainers: add Peter3579 --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a610d9337460..4c0dd5ec600a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19492,6 +19492,11 @@ github = "petee"; githubId = 89916; }; + Peter3579 = { + github = "Peter3579"; + githubId = 170885528; + name = "Peter3579"; + }; peterhoeg = { email = "peter@hoeg.com"; matrix = "@peter:hoeg.com"; From 337a911d3ba44bcabaeb560ddac3ed622a462a14 Mon Sep 17 00:00:00 2001 From: Peter3579 <170885528+Peter3579@users.noreply.github.com> Date: Mon, 16 Jun 2025 12:20:12 +0200 Subject: [PATCH 2/2] python3Packages.control: init at 0.10.1 Co-authored-by: dotlambda Co-authored-by: Wulpey --- .../python-modules/control/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/control/default.nix diff --git a/pkgs/development/python-modules/control/default.nix b/pkgs/development/python-modules/control/default.nix new file mode 100644 index 000000000000..e7f449273b62 --- /dev/null +++ b/pkgs/development/python-modules/control/default.nix @@ -0,0 +1,59 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + numpy, + scipy, + matplotlib, + setuptools, + setuptools-scm, + cvxopt, + pytest-timeout, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "control"; + version = "0.10.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-control"; + repo = "python-control"; + tag = version; + hash = "sha256-wLDYPuLnsZ2+cXf7j3BxUbn4IjHPt09LE9cjQGXWrO0="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + numpy + scipy + matplotlib + ]; + + optional-dependencies = { + # slycot is not in nixpkgs + # slycot = [ slycot ]; + cvxopt = [ cvxopt ]; + }; + + pythonImportsCheck = [ "control" ]; + + nativeCheckInputs = [ + cvxopt + pytest-timeout + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/python-control/python-control/releases/tag/${src.tag}"; + description = "Python Control Systems Library"; + homepage = "https://github.com/python-control/python-control"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Peter3579 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d3262b216a4..a908ef0a3b7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2897,6 +2897,8 @@ self: super: with self; { controku = callPackage ../development/python-modules/controku { }; + control = callPackage ../development/python-modules/control { }; + convertdate = callPackage ../development/python-modules/convertdate { }; convertertools = callPackage ../development/python-modules/convertertools { };