From be09acba5397717fafd42c6a7001e43815d75f0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 11:46:27 +0000 Subject: [PATCH 1/3] python311Packages.urwid: 2.6.11 -> 2.6.12 --- pkgs/development/python-modules/urwid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index aff9556f04b5..140cca2173b6 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.11"; + version = "2.6.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-EArHHsHqr1z+UhdsUCc4IPZa33sSCaR1sDSr7eCGSOM="; + hash = "sha256-JGX9v/x8c7ayHnxVjC7u4YLs3OvZmTzPNFUfqGCeIRQ="; }; postPatch = '' From 1e2940bb253376994128c0a908507ce6b0e44c9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 09:14:07 +0200 Subject: [PATCH 2/3] python312Packages.urwid: refactor --- pkgs/development/python-modules/urwid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 140cca2173b6..9ee9490a3223 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -35,12 +35,12 @@ buildPythonPackage rec { sed -i '/addopts =/d' pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ typing-extensions wcwidth ]; From 46b41b0c2c454316d342e43fdd7ed0aa3e026be1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 09:14:24 +0200 Subject: [PATCH 3/3] python312Packages.urwid: format with nixfmt --- .../python-modules/urwid/default.nix | 67 +++++++------------ 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 9ee9490a3223..b629fc39c022 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildPythonPackage -, exceptiongroup -, fetchFromGitHub -, glibcLocales -, pygobject3 -, pyserial -, pytestCheckHook -, pythonOlder -, pyzmq -, setuptools -, setuptools-scm -, tornado -, trio -, twisted -, typing-extensions -, wcwidth +{ + lib, + buildPythonPackage, + exceptiongroup, + fetchFromGitHub, + glibcLocales, + pygobject3, + pyserial, + pytestCheckHook, + pythonOlder, + pyzmq, + setuptools, + setuptools-scm, + tornado, + trio, + twisted, + typing-extensions, + wcwidth, }: buildPythonPackage rec { @@ -46,28 +47,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - glib = [ - pygobject3 - ]; - tornado = [ - tornado - ]; + glib = [ pygobject3 ]; + tornado = [ tornado ]; trio = [ exceptiongroup trio ]; - twisted = [ - twisted - ]; - zmq = [ - pyzmq - ]; - serial = [ - pyserial - ]; - lcd = [ - pyserial - ]; + twisted = [ twisted ]; + zmq = [ pyzmq ]; + serial = [ pyserial ]; + lcd = [ pyserial ]; }; nativeCheckInputs = [ @@ -77,18 +66,14 @@ buildPythonPackage rec { env.LC_ALL = "en_US.UTF8"; - pytestFlagsArray = [ - "tests" - ]; + pytestFlagsArray = [ "tests" ]; disabledTestPaths = [ # expect call hangs "tests/test_vterm.py" ]; - pythonImportsCheck = [ - "urwid" - ]; + pythonImportsCheck = [ "urwid" ]; meta = with lib; { description = "A full-featured console (xterm et al.) user interface library";