diff options
| author | Robert Scott <code@humanleg.org.uk> | 2024-01-01 17:38:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 17:38:18 +0000 |
| commit | a0d9bdbe49340d12084dfd2b911dbfbad5bc2aea (patch) | |
| tree | 80bf1ae6d81f3e33574d64748138b80a2aacf966 /pkgs/development/python-modules | |
| parent | 1606d72fc345426fa7d0711c7e265028cd92d75e (diff) | |
| parent | 925a03e1b36a709788d1897e90dcac2e9002f19d (diff) | |
Merge pull request #277428 from dotlambda/python-memcached-1.60
python311Packages.python-memcached: 1.59 -> 1.60
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pymemcache/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/python-modules/python-memcached/default.nix | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index 68925fe7f4a9..74784a35ff95 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -5,6 +5,7 @@ , mock , six , pytestCheckHook +, python-memcached , pythonOlder , zstd , stdenv @@ -32,6 +33,7 @@ buildPythonPackage rec { faker mock pytestCheckHook + python-memcached zstd ]; @@ -39,10 +41,7 @@ buildPythonPackage rec { sed -i "/--cov/d" setup.cfg ''; - disabledTests = [ - # python-memcached is not available (last release in 2017) - "TestClientSocketConnect" - ] ++ lib.optionals stdenv.is32bit [ + disabledTests = lib.optionals stdenv.is32bit [ # test_compressed_complex is broken on 32-bit platforms # this can be removed on the next version bump # see also https://github.com/pinterest/pymemcache/pull/480 diff --git a/pkgs/development/python-modules/python-memcached/default.nix b/pkgs/development/python-modules/python-memcached/default.nix index 27a9eed537bb..a2e30e45562d 100644 --- a/pkgs/development/python-modules/python-memcached/default.nix +++ b/pkgs/development/python-modules/python-memcached/default.nix @@ -1,25 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, six +, setuptools , mock , pytestCheckHook }: buildPythonPackage rec { pname = "python-memcached"; - version = "1.59"; - format = "setuptools"; + version = "1.60"; + pyproject = true; src = fetchFromGitHub { owner = "linsomniac"; repo = "python-memcached"; rev = version; - hash = "sha256-tHqkwNloPTXOrEGtuDLu1cTw4SKJ4auv8UUbqdNp698="; + hash = "sha256-ByW6WaR7OyWlKuzxVw12L0W5b88seLlIf5N5MKxiAog="; }; - propagatedBuildInputs = [ - six + nativeBuildInputs = [ + setuptools ]; nativeCheckInputs = [ |