From 5faa38e9de6202ff75183d33f07698f9385f7c13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Apr 2022 11:16:25 +0000 Subject: [PATCH 1/2] python310Packages.srvlookup: 2.0.0 -> 3.0.0 --- pkgs/development/python-modules/srvlookup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index f325d40ba92d..3ff5ec52c3d3 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "srvlookup"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1zf1v04zd5phabyqh0nhplr5a8vxskzfrzdh4akljnz1yk2n2a0b"; + sha256 = "sha256-jA2WUB3wEXvOgqwgdqA6HEULykPcTPg+VLAm9sLtXD4="; }; propagatedBuildInputs = [ dnspython ]; From ccd5b966a0837593011880a99aa66dad38f09aec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Apr 2022 13:55:33 +0200 Subject: [PATCH 2/2] python310Packages.srvlookup: switch to pytestCheckHook - add pythonImportsCheck - disable on older Python releases - update meta --- .../python-modules/srvlookup/default.nix | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index 3ff5ec52c3d3..11f31c06550f 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -1,24 +1,41 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib +, buildPythonPackage , dnspython -, mock, nose +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "srvlookup"; version = "3.0.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-jA2WUB3wEXvOgqwgdqA6HEULykPcTPg+VLAm9sLtXD4="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "sha256-iXbi25HsoNX0hnhwZoFik5ddlJ7i+xml3HGaezj3jgY="; }; - propagatedBuildInputs = [ dnspython ]; - checkInputs = [ mock nose ]; + propagatedBuildInputs = [ + dnspython + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "srvlookup" + ]; meta = with lib; { + description = "Wrapper for dnspython to return SRV records for a given host, protocol, and domain name"; homepage = "https://github.com/gmr/srvlookup"; - license = [ licenses.bsd3 ]; - description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples."; - maintainers = [ maintainers.mmlb ]; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ mmlb ]; }; }