From 67c487f243fd6ae6b734507a186104764b632211 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Jan 2016 01:40:55 +0100 Subject: [PATCH] pythonPackages.sphinx: 1.3.1 -> 1.3.4 Mainly bugfixes. Far too many to summarise here: http://www.sphinx-doc.org/en/stable/changes.html#release-1-3-4-released-jan-12-2016 --- .../python-modules/sphinx-1.3.1-pr-1946.patch | 35 ------------------- pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch diff --git a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch b/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch deleted file mode 100644 index 2933040141a..00000000000 --- a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7ce3b991229c74262f81ab7692a1dc6bde2416ee Mon Sep 17 00:00:00 2001 -From: Barry Warsaw -Date: Thu, 25 Jun 2015 11:54:05 -0400 -Subject: [PATCH] One way to work around the lack of - html.parser.HTMLParserError in Python 3.5 - ---- - sphinx/builders/linkcheck.py | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py -index 9f5c213..b05c5b2 100644 ---- a/sphinx/builders/linkcheck.py -+++ b/sphinx/builders/linkcheck.py -@@ -19,9 +19,19 @@ - from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler - from six.moves.urllib.parse import unquote, urlsplit, quote - from six.moves.urllib.error import HTTPError --from six.moves.html_parser import HTMLParser, HTMLParseError -+from six.moves.html_parser import HTMLParser - from docutils import nodes - -+# 2015-06-25 barry@python.org. This exception was deprecated in Python 3.3 and -+# removed in Python 3.5, however for backward compatibility reasons, we're not -+# going to just remove it. If it doesn't exist, define an exception that will -+# never be caught but leaves the code in check_anchor() intact. -+try: -+ from six.moves.html_parser import HTMLParseError -+except ImportError: -+ class HTMLParseError(Exception): -+ pass -+ - from sphinx.builders import Builder - from sphinx.util.console import purple, red, darkgreen, darkgray, \ - darkred, turquoise diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94d19e7b028..fc041acd47d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18903,14 +18903,13 @@ in modules // { sphinx = buildPythonPackage (rec { - name = "Sphinx-1.3.1"; + name = "Sphinx-1.3.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; - sha256 = "052i5c7cgvs5iv011dkq3r8d6jycg2gjjg3907ijsbdlq8q52vhs"; + sha256 = "0mw06q7bzzjylgwh0wnnaxmwc95hx8w95as4vcgpan579brw7b4a"; }; - patches = [ ../development/python-modules/sphinx-1.3.1-pr-1946.patch ]; LC_ALL = "en_US.UTF-8"; checkPhase = '' PYTHON=${python.executable} make test