From cee5ce177b5dc0373166bd277be9f48152ef9b2f Mon Sep 17 00:00:00 2001 From: desiderius Date: Mon, 9 Mar 2015 12:14:17 +0100 Subject: [PATCH 1/2] python-modules: enables support for pypy in sphinxcontrib-plantuml As the issue #6548 is closed thanks to iElectric we can now use sphinxcontrib-plantuml with pypy. --- pkgs/top-level/python-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0fbb4ccbe07..f91ba7e9ebf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10539,9 +10539,6 @@ let sphinxcontrib_plantuml = buildPythonPackage (rec { name = "sphinxcontrib-plantuml-0.5"; - # See issue #6548 - disabled = isPyPy; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sphinxcontrib-plantuml/${name}.tar.gz"; md5 = "4a8840fe3475a19c2af3fa877ab9d296"; From 6ee8c746c26c709e829f34890d6fe4547cc7629b Mon Sep 17 00:00:00 2001 From: desiderius Date: Mon, 9 Mar 2015 12:22:50 +0100 Subject: [PATCH 2/2] python-modules: enables support for pypy in sphinxcontrib-httpdomain As the issue #6548 is closed thanks to iElectric we can now use sphinxcontrib-httpdomain with pypy. --- pkgs/top-level/python-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f91ba7e9ebf..c5eba265d32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10512,9 +10512,6 @@ let sphinxcontrib_httpdomain = buildPythonPackage (rec { name = "sphinxcontrib-httpdomain-1.3.0"; - # See issue #6548 - disabled = isPyPy; - # Check is disabled due to this issue: # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype doCheck = false;