diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-02-01 19:20:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-01 19:20:25 +0100 |
commit | e1cc38d6f776a24d68b474f012b82c95ec2425fb (patch) | |
tree | 59a10a6110b4349cae7a7c20acf4102f31aefb41 | |
parent | 61aa366d564e35d8d9d44d4045b536a7fca28930 (diff) | |
parent | bcc3ab1d3756cf57bb5e6583eede22dc98547be4 (diff) |
Merge pull request #111483 from fabaff/bump-cachetools
-rw-r--r-- | pkgs/development/python-modules/cachetools/default.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 11 |
2 files changed, 18 insertions, 16 deletions
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 56efa9a348523..120fd5df124b7 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,17 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "cachetools"; - version = "4.1.1"; + version = "4.2.1"; - src = fetchPypi { - inherit pname version; - sha256 = "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20"; + src = fetchFromGitHub { + owner = "tkem"; + repo = pname; + rev = "v${version}"; + sha256 = "1b662ph8m2d05d2vi3izgnr6v7h9zfvscfsaaw8nhdmmm15ivfa6"; }; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cachetools" ]; + meta = with lib; { description = "Extensible memoizing collections and decorators"; homepage = "https://github.com/tkem/cachetools"; - license = licenses.mit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6020cdaa8400..716981fbc9edb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1119,16 +1119,7 @@ in { cachelib = callPackage ../development/python-modules/cachelib { }; - cachetools = let - cachetools' = callPackage ../development/python-modules/cachetools { }; - cachetools_2 = cachetools'.overridePythonAttrs (oldAttrs: rec { - version = "3.1.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; - }; - }); - in if isPy3k then cachetools' else cachetools_2; + cachetools = callPackage ../development/python-modules/cachetools { }; cachy = callPackage ../development/python-modules/cachy { }; |