From 90510399c58daa37606cd4bfbc62521e2ea623d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Feb 2021 22:02:20 +0100 Subject: [PATCH 1/2] pythpn3Packages.slixmpp: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/slixmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 012a49eb3236..250d7d771b7b 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.6.0"; + version = "1.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0jamly1jv31ragpv8yn52av1m48iwl4i7f9knb67vmk8c22rjdwa"; + sha256 = "sha256-fy7sRKS7ih4JmjOW/noL8qJ1xWVpQLbBbObHnMwT3Bc="; }; patches = [ From bc20dca5e4f1ff47b624251487786ed1ce8f5581 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Feb 2021 22:27:52 +0100 Subject: [PATCH 2/2] python3Packages.slixmpp: switch to pytestCheckHook --- .../python-modules/slixmpp/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 250d7d771b7b..341f53cfe0b5 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -1,4 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, substituteAll, aiodns, pyasn1, pyasn1-modules, aiohttp, gnupg, nose }: +{ lib +, buildPythonPackage +, aiodns +, aiohttp +, fetchPypi +, gnupg +, isPy3k +, pyasn1 +, pyasn1-modules +, pytestCheckHook +, substituteAll +}: buildPythonPackage rec { pname = "slixmpp"; @@ -18,17 +29,24 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ aiodns pyasn1 pyasn1-modules aiohttp ]; + propagatedBuildInputs = [ + aiodns + aiohttp + pyasn1 + pyasn1-modules + ]; - checkInputs = [ nose ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - nosetests --where=tests --exclude=live -i slixtest.py - ''; + # Exclude live tests + disabledTestFiles = [ "tests/live_test.py" ]; - meta = { + pythonImportsCheck = [ "slixmpp" ]; + + meta = with lib; { description = "Elegant Python library for XMPP"; - license = lib.licenses.mit; - homepage = "https://dev.louiz.org/projects/slixmpp"; + homepage = "https://slixmpp.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; }