From 22d6f654c4df6c22a3ac54e2c3a798dcbda1f1f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jan 2022 11:43:26 +0000 Subject: [PATCH 1/3] python38Packages.limnoria: 2021.11.20 -> 2022.1.1 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index ba45ffbdeac4..676c69f9a564 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.11.20"; + version = "2022.1.1"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "da9c33497a09b4ed0cff6ed44954bbde6cb317edb68d56c73ef235128a802c11"; + sha256 = "b49a94b0d46f4a2a6ebce4dfc49385502a23ae446baebcc880460d4a1ad33fc7"; }; postPatch = '' From 1aa42552ff055fafbf54c436dd00735fdb6f45bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 08:56:25 +0100 Subject: [PATCH 2/3] python3Packages.limnoria: disable on older Python releases --- pkgs/development/python-modules/limnoria/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 676c69f9a564..fad21d30ee5e 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder , git }: buildPythonPackage rec { pname = "limnoria"; version = "2022.1.1"; - disabled = isPy27; # abandoned upstream + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -18,6 +19,7 @@ buildPythonPackage rec { postPatch = '' sed -i 's/version=version/version="${version}"/' setup.py ''; + buildInputs = [ git ]; # cannot be imported @@ -29,5 +31,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; }; - } From 0b2e3c4abae223b113dbb1ddb2d5e4814cc04fe3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 11:50:25 +0100 Subject: [PATCH 3/3] python3Packages.limnoria: enable tests --- .../python-modules/limnoria/default.nix | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index fad21d30ee5e..8e2cb3ca366e 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -1,29 +1,62 @@ { lib , buildPythonPackage +, chardet +, cryptography +, feedparser , fetchPypi +, mock +, pysocks +, pytestCheckHook +, python-dateutil +, python-gnupg , pythonOlder -, git +, pytz }: buildPythonPackage rec { pname = "limnoria"; version = "2022.1.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b49a94b0d46f4a2a6ebce4dfc49385502a23ae446baebcc880460d4a1ad33fc7"; + hash = "sha256-tJqUsNRvSipuvOTfxJOFUCojrkRrrrzIgEYNShrTP8c="; }; - postPatch = '' - sed -i 's/version=version/version="${version}"/' setup.py - ''; - - buildInputs = [ git ]; + propagatedBuildInputs = [ + chardet + cryptography + feedparser + mock + pysocks + python-dateutil + python-gnupg + ] ++ lib.optionals (pythonOlder "3.9") [ + pytz + ]; - # cannot be imported - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version=version" 'version="${version}"' + ''; + + checkPhase = '' + runHook preCheck + export PATH="$PATH:$out/bin"; + supybot-test test -v --no-network + runHook postCheck + ''; + + pythonImportsCheck = [ + # Uses the same names as Supybot + "supybot" + ]; meta = with lib; { description = "A modified version of Supybot, an IRC bot";