diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-04 22:43:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-04 22:43:05 +0100 |
| commit | c12e3c11436727de97ba19b4d13600f4356f7280 (patch) | |
| tree | 59b59c2feb15935f85258e54a4638a4ddd96b42a | |
| parent | be43328b2ed76485e8d255db88d030de96114611 (diff) | |
| parent | 51dd26733512b3d2393ab8ad307662ee64a5b29a (diff) | |
| download | nixpkgs-c12e3c11436727de97ba19b4d13600f4356f7280.tar nixpkgs-c12e3c11436727de97ba19b4d13600f4356f7280.tar.gz nixpkgs-c12e3c11436727de97ba19b4d13600f4356f7280.tar.bz2 nixpkgs-c12e3c11436727de97ba19b4d13600f4356f7280.tar.lz nixpkgs-c12e3c11436727de97ba19b4d13600f4356f7280.tar.xz nixpkgs-c12e3c11436727de97ba19b4d13600f4356f7280.tar.zst nixpkgs-c12e3c11436727de97ba19b4d13600f4356f7280.zip | |
Merge pull request #142221 from sternenseemann/zopfli-0.1.9
| -rw-r--r-- | pkgs/development/python-modules/zopfli/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index 9d675779351..d7e9cf507f0 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, zopfli, pytest }: buildPythonPackage rec { pname = "zopfli"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "8b977dc07e3797907ab59e08096583bcd0b7e6c739849fbbeec09263f6356623"; + sha256 = "78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b"; extension = "zip"; }; + nativeBuildInputs = [ setuptools-scm ]; + + buildInputs = [ zopfli ]; + USE_SYSTEM_ZOPFLI = "True"; + # doesn't work with pytestCheckHook checkInputs = [ pytest ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f8c9542128..b5fd1167640 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10211,7 +10211,9 @@ in { zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; - zopfli = callPackage ../development/python-modules/zopfli { }; + zopfli = callPackage ../development/python-modules/zopfli { + inherit (pkgs) zopfli; + }; zstandard = callPackage ../development/python-modules/zstandard { }; |