From 94ec8b4c6f654b3d196ace3312877141275344e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Aug 2022 04:42:09 +0000 Subject: [PATCH 1/4] python310Packages.pylibmc: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/pylibmc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 9fb8401bdc47..701adc7c6e90 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }: buildPythonPackage rec { - version = "1.6.1"; + version = "1.6.2"; pname = "pylibmc"; src = fetchPypi { inherit pname version; - sha256 = "1sg7d9j0v6g3xg3finf4l1hb72c13vcyyi6rqrc9shbx903d93ca"; + sha256 = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA="; }; buildInputs = [ libmemcached zlib cyrus_sasl ]; From fb6659387d13d5245d5edde8c52e4be5ac5aaf53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Aug 2022 18:28:52 +0200 Subject: [PATCH 2/4] python310Packages.pylibmc: add pythonImportsCheck --- .../python-modules/pylibmc/default.nix | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 701adc7c6e90..25bf09c12540 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,23 +1,44 @@ -{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }: +{ lib +, buildPythonPackage +, cyrus_sasl +, fetchPypi +, libmemcached +, zlib +}: buildPythonPackage rec { - version = "1.6.2"; pname = "pylibmc"; + version = "1.6.2"; + format = "setuptools"; + + disabled = pythonAtLeast "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA="; + hash = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA="; }; - buildInputs = [ libmemcached zlib cyrus_sasl ]; - setupPyBuildFlags = [ "--with-sasl2" ]; + buildInputs = [ + cyrus_sasl + libmemcached + zlib + ]; - # requires an external memcached server running + setupPyBuildFlags = [ + "--with-sasl2" + ]; + + # Requires an external memcached server running doCheck = false; + pythonImportsCheck = [ + "pylibmc" + ]; + meta = with lib; { description = "Quick and small memcached client for Python"; homepage = "http://sendapatch.se/projects/pylibmc/"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 3c3999e2ff8c7661dbd6350cce08cd4fafc164a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Aug 2022 18:47:53 +0200 Subject: [PATCH 3/4] python310Packages.pylibmc: update disabled --- pkgs/development/python-modules/pylibmc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 25bf09c12540..a7018b38c7bc 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -3,6 +3,7 @@ , cyrus_sasl , fetchPypi , libmemcached +, pythonOlder , zlib }: @@ -11,7 +12,7 @@ buildPythonPackage rec { version = "1.6.2"; format = "setuptools"; - disabled = pythonAtLeast "3.7"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 4244408aa6ea264f4b054799bfda7b29632d0fc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Aug 2022 19:26:13 +0200 Subject: [PATCH 4/4] python310Packages.pylibmc: remove whitespace --- pkgs/development/python-modules/pylibmc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index a7018b38c7bc..039c793f20b2 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.6.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version;