From 074a88834ae9053d4c355333c48c9d8b99d088ac Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 19 Oct 2021 16:53:35 +0200 Subject: [PATCH 1/2] python3Packages.zopfli: 0.1.8 -> 0.1.9 --- pkgs/development/python-modules/zopfli/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index 9d6757793511..6a7808f4fe91 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -1,15 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, 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 ]; + # doesn't work with pytestCheckHook checkInputs = [ pytest ]; From 51dd26733512b3d2393ab8ad307662ee64a5b29a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 19 Oct 2021 16:57:37 +0200 Subject: [PATCH 2/2] python3Packages.zopfli: link against our zopfli instead of vendoring https://github.com/fonttools/py-zopfli/pull/9 --- pkgs/development/python-modules/zopfli/default.nix | 5 ++++- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index 6a7808f4fe91..d7e9cf507f03 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, zopfli, pytest }: buildPythonPackage rec { pname = "zopfli"; @@ -12,6 +12,9 @@ buildPythonPackage rec { 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 dd01245a1798..9ad592468f91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10079,7 +10079,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 { };