From 051fe7c2227563698ffff9844ea3229dd87d7dad Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 14 Jun 2023 11:55:14 +0100 Subject: [PATCH 1/3] python3Packages.pkgutil-resolve-name: init at 1.3.10 --- .../pkgutil-resolve-name/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pkgutil-resolve-name/default.nix diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix new file mode 100644 index 000000000000..00b419ca7c19 --- /dev/null +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nix-update-script +, pythonOlder +}: +buildPythonPackage rec { + pname = "pkgutil_resolve_name"; + version = "1.3.10"; + src = fetchPypi { + inherit pname version; + hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; + }; + format = "flit"; + disabled = pythonOlder "3.7"; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://pypi.org/project/pkgutil_resolve_name/"; + description = "A backport of Python 3.9’s pkgutil.resolve_name."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yajo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd5c9b3b1f00..58b16f835fe4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7530,6 +7530,8 @@ self: super: with self; { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { }; + micloud = callPackage ../development/python-modules/micloud { }; msgraph-core = callPackage ../development/python-modules/msgraph-core { }; From 0f574794a21a050a1d0ec28bc75663e569f7b7ff Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 14 Jun 2023 11:57:56 +0100 Subject: [PATCH 2/3] python38Packages.jsonschema: depend on pkgutil-resolve-name The missing dependency was making the build fail. See https://github.com/python-jsonschema/jsonschema/blob/d35f2c258a8a4fed7533d73e9fe3f3ec36c579e8/pyproject.toml#L42 Co-authored-by: Sandro --- .../development/python-modules/jsonschema/default.nix | 2 ++ .../python-modules/pkgutil-resolve-name/default.nix | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index f60b693a8287..52bc89511d23 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -7,6 +7,7 @@ , hatchling , importlib-metadata , importlib-resources +, pkgutil-resolve-name , pyrsistent , pythonOlder , twisted @@ -54,6 +55,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources + pkgutil-resolve-name ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index 00b419ca7c19..79c5c209d07b 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -5,14 +5,17 @@ , pythonOlder }: buildPythonPackage rec { - pname = "pkgutil_resolve_name"; + pname = "pkgutil-resolve-name"; version = "1.3.10"; + format = "flit"; + + disabled = pythonOlder "3.7"; + src = fetchPypi { - inherit pname version; + pname = "pkgutil_resolve_name"; + inherit version; hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; - format = "flit"; - disabled = pythonOlder "3.7"; passthru.updateScript = nix-update-script { }; From acf257276d958a1507513f48bbd0c7c2a9e7b1ae Mon Sep 17 00:00:00 2001 From: Jairo Llopis <973709+yajo@users.noreply.github.com> Date: Mon, 19 Jun 2023 08:28:04 +0100 Subject: [PATCH 3/3] python3Packages.pkgutil-resolve-name: disable unexisting checks Co-authored-by: Sandro --- .../python-modules/pkgutil-resolve-name/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index 79c5c209d07b..d70cfd1c4345 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -17,6 +17,9 @@ buildPythonPackage rec { hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; + # has no tests + doCheck = false; + passthru.updateScript = nix-update-script { }; meta = {