From b273dc0b743444444bcef20fbc4221c021945096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 30 Aug 2024 22:17:20 -0700 Subject: [PATCH] python312Packages.sisyphus-control: 3.1.3 -> 3.1.4 Diff: https://github.com/jkeljo/sisyphus-control/compare/refs/tags/v3.1.3...v3.1.4 Changelog: https://github.com/jkeljo/sisyphus-control/blob/v3.1.4/CHANGELOG.rst --- .../sisyphus-control/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sisyphus-control/default.nix b/pkgs/development/python-modules/sisyphus-control/default.nix index eeaaea1cb01e..617c22257811 100644 --- a/pkgs/development/python-modules/sisyphus-control/default.nix +++ b/pkgs/development/python-modules/sisyphus-control/default.nix @@ -3,16 +3,18 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + fetchpatch2, netifaces, - python-engineio, - python-socketio, + poetry-core, + python-engineio-v3, + python-socketio-v4, pythonOlder, }: buildPythonPackage rec { pname = "sisyphus-control"; - version = "3.1.3"; - format = "setuptools"; + version = "3.1.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,20 +22,25 @@ buildPythonPackage rec { owner = "jkeljo"; repo = "sisyphus-control"; rev = "refs/tags/v${version}"; - hash = "sha256-FbZWvsm2NT9a7TgHKWh/LHPsse6NBLK2grlOtHDbV2Y="; + hash = "sha256-1/trJ/mfiXljNt7ZIBwQ45mIBbqg68e29lvVsPDPzoU="; }; - pythonRelaxDeps = [ - "python-engineio" - "python-socketio" + patches = [ + # https://github.com/jkeljo/sisyphus-control/pull/9 + (fetchpatch2 { + name = "specify-build-system.patch"; + url = "https://github.com/jkeljo/sisyphus-control/commit/dd48079e03a53cdb3af721de0d307209286c38f0.patch"; + hash = "sha256-573YLPrNbbMXSrZ3gK8cmHmuk2+UeggcKL/+eo4pgrs="; + }) ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp netifaces - python-engineio - python-socketio + python-engineio-v3 + python-socketio-v4 ]; # Module has no tests @@ -44,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Control your Sisyphus Kinetic Art Table"; homepage = "https://github.com/jkeljo/sisyphus-control"; - changelog = "https://github.com/jkeljo/sisyphus-control/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/jkeljo/sisyphus-control/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; };