From e0969b44bf7ea4be5b6dae5cf9cca29747794a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 23 Mar 2022 09:35:39 +0100 Subject: [PATCH 1/2] python39Packages.urwid: update homepage, remove old meta.repositories.git --- pkgs/development/python-modules/urwid/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7dcc56d9f6e8..dc46993af478 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -21,8 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A full-featured console (xterm et al.) user interface library"; - homepage = "https://excess.org/urwid"; - repositories.git = "git://github.com/wardi/urwid.git"; + homepage = "https://urwid.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; }; From c1538169de920b76750b4b118d81eb89c2c52294 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Mar 2022 10:26:40 +0100 Subject: [PATCH 2/2] python3Packages.urwid: specify license --- .../development/python-modules/urwid/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index dc46993af478..3df7f6703a79 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, isPy27 +, glibcLocales +}: buildPythonPackage rec { pname = "urwid"; version = "2.1.2"; + format = "setuptools"; + disabled = isPy27; src = fetchPypi { @@ -17,12 +25,14 @@ buildPythonPackage rec { # tests which assert on strings don't decode results correctly doCheck = isPy3k; - pythonImportsCheck = [ "urwid" ]; + pythonImportsCheck = [ + "urwid" + ]; meta = with lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = "https://urwid.org/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; }; }