From 444a6b8d9ee61e13be91c57fd78ac26e20629d40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Jan 2020 15:40:23 +0100 Subject: [PATCH] python2Packages.cachetools: restore 3.1.1 for python2 --- .../python-modules/cachetools/default.nix | 1 - pkgs/top-level/python-packages.nix | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index dabd5cee60e9..30f0d9132bb1 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "cachetools"; version = "4.0.0"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5baccd2483b6..41201d22352b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4392,7 +4392,17 @@ in { rfc3986 = callPackage ../development/python-modules/rfc3986 { }; - cachetools = callPackage ../development/python-modules/cachetools {}; + 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; cma = callPackage ../development/python-modules/cma { };