From 56eea3bc4fb648bebfea8de9eafb5db8c2e20bd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jan 2022 01:24:56 +0000 Subject: [PATCH 1/2] python38Packages.uritools: 3.0.2 -> 4.0.0 --- pkgs/development/python-modules/uritools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 1d9150428084..4999a1e6469f 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "uritools"; - version = "3.0.2"; + version = "4.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "28ffef82ce3b2793237d36e45aa7cde28dae6502f6a93fdbd05ede401520e279"; + sha256 = "420d94c1ff4bf90c678fca9c17b8314243bbcaa992c400a95e327f7f622e1edf"; }; meta = with lib; { From 692e493c993552bd44a2a72fba7f2b6e2ce6f197 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 08:25:33 +0100 Subject: [PATCH 2/2] python3Packages.uritools: add pythonImportsCheck, update meta --- .../python-modules/uritools/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 4999a1e6469f..3d1b274d0690 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -1,18 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "uritools"; version = "4.0.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "420d94c1ff4bf90c678fca9c17b8314243bbcaa992c400a95e327f7f622e1edf"; }; + pythonImportsCheck = [ + "uritools" + ]; + meta = with lib; { description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse"; + homepage = "https://github.com/tkem/uritools/"; license = licenses.mit; - maintainers = [ maintainers.rvolosatovs ]; + maintainers = with maintainers; [ rvolosatovs ]; }; }