summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-09-19 12:27:33 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2016-09-19 13:09:08 +0200
commit3ec7b1fbec77c0f124b442c27ba8cf3c0f3cfea8 (patch)
tree3dc6bb2b972e75ff2cdda5748e4c2d650e6519b3
parent0095a9a323e6e0eba6be93aded9683bdb53fd847 (diff)
downloadnixpkgs-3ec7b1fbec77c0f124b442c27ba8cf3c0f3cfea8.tar
nixpkgs-3ec7b1fbec77c0f124b442c27ba8cf3c0f3cfea8.tar.gz
nixpkgs-3ec7b1fbec77c0f124b442c27ba8cf3c0f3cfea8.tar.bz2
nixpkgs-3ec7b1fbec77c0f124b442c27ba8cf3c0f3cfea8.tar.lz
nixpkgs-3ec7b1fbec77c0f124b442c27ba8cf3c0f3cfea8.tar.xz
nixpkgs-3ec7b1fbec77c0f124b442c27ba8cf3c0f3cfea8.tar.zst
nixpkgs-3ec7b1fbec77c0f124b442c27ba8cf3c0f3cfea8.zip
pythonPackages.gevent: 1.0.2 -> 1.1.2
-rw-r--r--pkgs/top-level/python-packages.nix18
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0c5d3de53b..9da63ce2971 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11138,22 +11138,30 @@ in modules // {
   };
 
   gevent = buildPythonPackage rec {
-    name = "gevent-1.0.2";
-    disabled = isPy3k || isPyPy;  # see https://github.com/surfly/gevent/issues/248
+    name = "gevent-1.1.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/g/gevent/${name}.tar.gz";
-      sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s";
+      sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c";
     };
 
-    patchPhase = ''
+    # Why do we have this patch?
+    postPatch = ''
       substituteInPlace libev/ev.c --replace \
         "ecb_inline void ecb_unreachable (void) ecb_noreturn" \
         "ecb_inline ecb_noreturn void ecb_unreachable (void)"
     '';
 
     buildInputs = with self; [ pkgs.libev ];
-    propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ];
+    propagatedBuildInputs = with self; optionals (!isPyPy) [ greenlet ];
+
+    checkPhase = ''
+      cd greentest
+      ${python.interpreter} testrunner.py
+    '';
+
+    # Bunch of failures.
+    doCheck = false;
 
     meta = {
       description = "Coroutine-based networking library";