diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix index ab2a23b1994c..b792ec3428e7 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { mopidy pythonPackages.requests pythonPackages.gmusicapi - pythonPackages.cachetools + pythonPackages.cachetools_1 ]; doCheck = false; diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix new file mode 100644 index 000000000000..edfe965fa800 --- /dev/null +++ b/pkgs/development/python-modules/cachetools/1.nix @@ -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; + }; +} diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix new file mode 100644 index 000000000000..fe69768c976a --- /dev/null +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19899264a7bb..f11f3e2c2c0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14289,7 +14289,7 @@ in { oslo-serialization oslo-utils iso8601 oslo-log oslo-i18n webob ]; buildInputs = with self; [ - oslo-middleware cachetools oslo-service futurist anyjson oslosphinx + oslo-middleware cachetools_1 oslo-service futurist anyjson oslosphinx testtools oslotest ]; @@ -14298,20 +14298,8 @@ in { }; }; - cachetools = buildPythonPackage rec { - name = "cachetools-${version}"; - 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"; - }; - }; + cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; + cachetools = callPackage ../development/python-modules/cachetools {}; futurist = buildPythonPackage rec { name = "futurist-${version}"; @@ -14347,7 +14335,7 @@ in { propagatedBuildInputs = with self; [ pbr oslo-config oslo-context oslo-log oslo-utils oslo-serialization 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 ]; @@ -14754,7 +14742,7 @@ in { }; 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 ]; buildInputs = with self; [