From 7ee53c0c4fe28f81095298893c8c2fd4e7bc2886 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Wed, 28 Apr 2021 18:38:29 +0300 Subject: [PATCH] python2Packages.importlib-resources: use version 3.3.1 for python2 --- .../python-modules/importlib-resources/2.nix | 38 +++++++++++++++++++ .../importlib-resources/default.nix | 11 +++--- pkgs/top-level/python2-packages.nix | 2 + 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/importlib-resources/2.nix diff --git a/pkgs/development/python-modules/importlib-resources/2.nix b/pkgs/development/python-modules/importlib-resources/2.nix new file mode 100644 index 00000000000..1034c311130 --- /dev/null +++ b/pkgs/development/python-modules/importlib-resources/2.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, importlib-metadata +, typing +, singledispatch +, python +}: + +buildPythonPackage rec { + pname = "importlib-resources"; + version = "3.3.1"; + + src = fetchPypi { + pname = "importlib_resources"; + inherit version; + sha256 = "0ed250dbd291947d1a298e89f39afcc477d5a6624770503034b72588601bcc05"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ + importlib-metadata + singledispatch + typing + ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "Read resources from Python packages"; + homepage = "https://importlib-resources.readthedocs.io/"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index cd8fec1e54e..2388fb1b26d 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -1,8 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm -, toml +, setuptools-scm , importlib-metadata , typing ? null , singledispatch ? null @@ -11,15 +10,16 @@ }: buildPythonPackage rec { - pname = "importlib_resources"; + pname = "importlib-resources"; version = "5.1.2"; src = fetchPypi { - inherit pname version; + pname = "importlib_resources"; + inherit version; sha256 = "642586fc4740bd1cad7690f836b3321309402b20b332529f25617ff18e8e1370"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata ] ++ lib.optional (pythonOlder "3.4") singledispatch @@ -34,5 +34,6 @@ buildPythonPackage rec { description = "Read resources from Python packages"; homepage = "https://importlib-resources.readthedocs.io/"; license = licenses.asl20; + maintainers = [ ]; }; } diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 915c2edec70..81bdcdb93db 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -178,6 +178,8 @@ with self; with super; { importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { }; + importlib-resources = callPackage ../development/python-modules/importlib-resources/2.nix { }; + ipaddr = callPackage ../development/python-modules/ipaddr { }; ipykernel = callPackage ../development/python-modules/ipykernel/4.nix { };