public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111483 from fabaff/bump-cachetools

This commit is contained in:
Sandro 2021-02-01 19:20:25 +01:00 committed by GitHub
parent 61aa366d56 bcc3ab1d37
commit e1cc38d6f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/python-modules/cachetools/default.nix
View File

@ -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 ];
};
}

11
pkgs/top-level/python-packages.nix
View File

@ -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 { };