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

pythonPackages.cachetools: Add version 2.0.1

Browse Source 
Textacy requires a later version.

v2.0.0 introduced breaking changes, so keep two versions for other
packages.
This commit is contained in:
Rodney Lorrimar 2017-09-13 00:54:52 +01:00
parent 151d0fde19
commit 31037bab49
4 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/mopidy-gmusic/default.nix
View File

@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
mopidy mopidy
pythonPackages.requests pythonPackages.requests
pythonPackages.gmusicapi pythonPackages.gmusicapi
pythonPackages.cachetools pythonPackages.cachetools_1
]; ];
doCheck = false; doCheck = false;

18
pkgs/development/python-modules/cachetools/1.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "cachetools";
version = "1.1.3";
disabled = isPyPy; # a test fails
src = fetchPypi {
inherit pname version;
sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20";
};
meta = with stdenv.lib; {
homepage = "https://github.com/tkem/cachetools";
license = licenses.mit;
};
}

18
pkgs/development/python-modules/cachetools/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "cachetools";
version = "2.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "0pdw2fr29pxlyn1g5fhdrrqbpn0iw062nv716ngdqvdx7hnizq7d";
};
meta = with stdenv.lib; {
description = "Extensible memoizing collections and decorators";
homepage = "https://github.com/tkem/cachetools";
license = licenses.mit;
};
}

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

@ -14289,7 +14289,7 @@ in {
oslo-serialization oslo-utils iso8601 oslo-log oslo-i18n webob oslo-serialization oslo-utils iso8601 oslo-log oslo-i18n webob
]; ];
buildInputs = with self; [ buildInputs = with self; [
oslo-middleware cachetools oslo-service futurist anyjson oslosphinx oslo-middleware cachetools_1 oslo-service futurist anyjson oslosphinx
testtools oslotest testtools oslotest
]; ];
@ -14298,20 +14298,8 @@ in {
}; };
}; };
cachetools = buildPythonPackage rec { cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {};
name = "cachetools-${version}"; cachetools = callPackage ../development/python-modules/cachetools {};
version = "1.1.3";
disabled = isPyPy; # a test fails
src = pkgs.fetchurl {
url = "mirror://pypi/c/cachetools/${name}.tar.gz";
sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20";
};
meta = with stdenv.lib; {
homepage = "https://github.com/tkem/cachetools";
};
};
futurist = buildPythonPackage rec { futurist = buildPythonPackage rec {
name = "futurist-${version}"; name = "futurist-${version}";
@ -14347,7 +14335,7 @@ in {
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
pbr oslo-config oslo-context oslo-log oslo-utils oslo-serialization pbr oslo-config oslo-context oslo-log oslo-utils oslo-serialization
oslo-i18n stevedore six eventlet greenlet webob pyyaml kombu_3 trollius oslo-i18n stevedore six eventlet greenlet webob pyyaml kombu_3 trollius
aioeventlet cachetools oslo-middleware futurist redis oslo-service aioeventlet cachetools_1 oslo-middleware futurist redis oslo-service
eventlet pyzmq eventlet pyzmq
]; ];
@ -14754,7 +14742,7 @@ in {
}; };
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
pbr futures enum34 debtcollector cachetools oslo-serialization oslo-utils pbr futures enum34 debtcollector cachetools_1 oslo-serialization oslo-utils
jsonschema monotonic stevedore networkx futurist pbr automaton fasteners jsonschema monotonic stevedore networkx futurist pbr automaton fasteners
]; ];
buildInputs = with self; [ buildInputs = with self; [