From f7e7f925ec4ec91ac03c88c1bd1e83ab8e715054 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Apr 2022 11:48:38 +0000 Subject: [PATCH 1/3] python310Packages.libthumbor: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/libthumbor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index c3d8ec9526f..1565b4da9e5 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "libthumbor"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "ed4fe5f27f8f90e7285b7e6dce99c1b67d43a140bf370e989080b43d80ce25f0"; + sha256 = "sha256-1PsiFZrTDVQqy8A3nkaM5LdPiBoriRgHkklTOiczN+g="; }; buildInputs = [ django ]; From af09feefd543087646128c196c3a805c614a7d99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Apr 2022 20:03:29 +0200 Subject: [PATCH 2/3] python3Packages.libthumbor: disable on older Python releases add pythonImportsCheck --- .../python-modules/libthumbor/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index 1565b4da9e5..2d953d863de 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -9,21 +9,34 @@ buildPythonPackage rec { pname = "libthumbor"; version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1PsiFZrTDVQqy8A3nkaM5LdPiBoriRgHkklTOiczN+g="; + hash = "sha256-1PsiFZrTDVQqy8A3nkaM5LdPiBoriRgHkklTOiczN+g="; }; - buildInputs = [ django ]; - propagatedBuildInputs = [ six pycrypto ]; + buildInputs = [ + django + ]; + + propagatedBuildInputs = [ + six + pycrypto + ]; doCheck = false; + pythonImportsCheck = [ + "libthumbor" + ]; + meta = with lib; { - description = "libthumbor is the python extension to thumbor"; + description = "Python extension to thumbor"; homepage = "https://github.com/heynemann/libthumbor"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From 00b41eee6bf6cf05390b46ad6c811cba91fafe1f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Apr 2022 20:08:07 +0200 Subject: [PATCH 3/3] python3Packages.libthumbor: add missing input --- pkgs/development/python-modules/libthumbor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index 2d953d863de..0fdb4c4fab9 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -4,6 +4,7 @@ , django , six , pycrypto +, pythonOlder }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ - django + django ]; propagatedBuildInputs = [