Merge master into staging

1 files changed, 12 insertions, 3 deletions

diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
index bcaa844720bd3..2a8b5e7960d46 100644
--- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
+++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
@@ -2,10 +2,11 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
-, pythonOlder
+, isPy3k
+, pytest
 }:
 
-if !(pythonOlder "3.3") then null else buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "backports.functools_lru_cache";
   version = "1.5";
 
@@ -15,7 +16,15 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec {
   };
 
   buildInputs = [ setuptools_scm ];
-  doCheck = false; # No proper test
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  # Test fail on Python 2
+  doCheck = isPy3k;
 
   meta = {
     description = "Backport of functools.lru_cache";