From 7dc30306f41115cb654e3f1ddf9c4afe89258207 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Feb 2024 10:30:35 +0100 Subject: [PATCH 1/5] python311Packages.urwid: 2.4.3 -> 2.5.3 Changelog: https://github.com/urwid/urwid/releases/tag/2.5.3 --- pkgs/development/python-modules/urwid/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index cf42463c19b2..df901d6eb2c2 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -13,11 +13,13 @@ , tornado , trio , twisted +, typing-extensions +, wcwidth }: buildPythonPackage rec { pname = "urwid"; - version = "2.4.3"; + version = "2.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +28,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-raDsUZaXBC4s/48KNH8Thrpm8Bq8wj9+Rahk+LkxcDo="; + hash = "sha256-NtgfB/5gY9nCC2ZdV5WABxsj/2tcXTheToKpxTuKdKI="; }; postPatch = '' @@ -38,6 +40,11 @@ buildPythonPackage rec { setuptools-scm ]; + propagatedBuildInputs = [ + typing-extensions + wcwidth + ]; + passthru.optional-dependencies = { glib = [ pygobject3 From db91fb88efa7bcbc924094678fed83d9873c28af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Feb 2024 15:27:51 +0100 Subject: [PATCH 2/5] python311Packages.nomadnet: 0.4.5 -> 0.4.6 Diff: https://github.com/markqvist/NomadNet/compare/refs/tags/0.4.5...0.4.6 Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.4.6 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 19488765269b..a722c4b6823c 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-+w/Earu76mMJFp8ALvaDEkZOGJqlKbO7jfpW/xxvd1o="; + hash = "sha256-23TIBSWOYgo7xEilB4raNMbEWIyPFHAh9jsVzh40S8I="; }; nativeBuildInputs = [ From ecaadca24a51d52cb215968801c963963947d385 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Feb 2024 15:38:51 +0100 Subject: [PATCH 3/5] python312Packages.urwidtrees: refactor --- .../python-modules/urwidtrees/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 82744984d007..f12f91906efa 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, glibcLocales -, urwid , fetchpatch +, setuptools +, urwid }: buildPythonPackage rec { pname = "urwidtrees"; - format = "setuptools"; version = "1.0.3"; + pyproject = true; src = fetchFromGitHub { owner = "pazz"; repo = "urwidtrees"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g="; }; - propagatedBuildInputs = [ urwid ]; - patches = [ (fetchpatch { url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch"; @@ -27,13 +25,26 @@ buildPythonPackage rec { }) ]; - nativeCheckInputs = [ glibcLocales ]; - LC_ALL="en_US.UTF-8"; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + urwid + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "urwidtrees" + ]; meta = with lib; { description = "Tree widgets for urwid"; homepage = "https://github.com/pazz/urwidtrees"; - license = licenses.gpl3; + changelog = "https://github.com/pazz/urwidtrees/releases/tag/${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; - } From d3723e4d812aada188285879bc46062637fe09d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Feb 2024 15:40:38 +0100 Subject: [PATCH 4/5] python311Packages.urwidgets: 0.1.1 -> 0.2.0 Diff: https://github.com/AnonymouX47/urwidgets/compare/refs/tags/v0.1.1...v0.2.0 Changelog: https://github.com/AnonymouX47/urwidgets/releases/tag/v0.2.0 --- .../python-modules/urwidgets/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/urwidgets/default.nix b/pkgs/development/python-modules/urwidgets/default.nix index 9b6f33c0bd7c..82e4eee38379 100644 --- a/pkgs/development/python-modules/urwidgets/default.nix +++ b/pkgs/development/python-modules/urwidgets/default.nix @@ -1,39 +1,41 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub +, pythonOlder , setuptools , urwid -, wheel }: buildPythonPackage rec { pname = "urwidgets"; - version = "0.1.1"; + version = "0.2.0"; pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "AnonymouX47"; repo = "urwidgets"; rev = "refs/tags/v${version}"; - hash = "sha256-0aZLL0NutptPkuLHv3bTzR1/SNqLgMdUYWET6mLE0IU="; + hash = "sha256-ultlfNeCGFTqKaMeXu0+NihkN5/6NtMewk33YfIzhu8="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ urwid ]; - pythonImportsCheck = [ "urwidgets" ]; + pythonImportsCheck = [ + "urwidgets" + ]; meta = with lib; { description = "A collection of widgets for urwid"; homepage = "https://github.com/AnonymouX47/urwidgets"; + changelog = "https://github.com/AnonymouX47/urwidgets/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ huyngo ]; }; From 7cf1ab2c49573fc2b6771372ecf832eb6b505bdd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Feb 2024 15:41:33 +0100 Subject: [PATCH 5/5] python311Packages.urwid: 2.5.3 -> 2.6.1 Diff: https://github.com/urwid/urwid/compare/refs/tags/2.5.3...2.6.1 Changelog: https://github.com/urwid/urwid/releases/tag/2.6.1 --- 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 df901d6eb2c2..b59d7845b210 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.5.3"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-NtgfB/5gY9nCC2ZdV5WABxsj/2tcXTheToKpxTuKdKI="; + hash = "sha256-D/ZxN9hVVmAgHGdLGrSD2VAMSd4II8z6GzO1VDuyw9M="; }; postPatch = ''