diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/python-modules/importlib-resources | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/importlib-resources')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/importlib-resources/2.nix | 38 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix | 11 |
2 files changed, 44 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/importlib-resources/2.nix b/nixpkgs/pkgs/development/python-modules/importlib-resources/2.nix new file mode 100644 index 000000000000..1034c3111306 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix index cd8fec1e54e0..2388fb1b26df 100644 --- a/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix +++ b/nixpkgs/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 = [ ]; }; } |