summary refs log tree commit diff
path: root/pkgs/development/python-modules/sphinx
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-08-24 19:34:20 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-08-25 19:36:14 +0200
commitd58e1f1c7b3e955d3ee1194ea96c574338b47b97 (patch)
treeff5f3050d12cf64603e87d1c2066580435c8f5e1 /pkgs/development/python-modules/sphinx
parentfb4357445665ab12877cbc49027f7593b471b288 (diff)
downloadnixlib-d58e1f1c7b3e955d3ee1194ea96c574338b47b97.tar
nixlib-d58e1f1c7b3e955d3ee1194ea96c574338b47b97.tar.gz
nixlib-d58e1f1c7b3e955d3ee1194ea96c574338b47b97.tar.bz2
nixlib-d58e1f1c7b3e955d3ee1194ea96c574338b47b97.tar.lz
nixlib-d58e1f1c7b3e955d3ee1194ea96c574338b47b97.tar.xz
nixlib-d58e1f1c7b3e955d3ee1194ea96c574338b47b97.tar.zst
nixlib-d58e1f1c7b3e955d3ee1194ea96c574338b47b97.zip
python.pkgs: many updates
Diffstat (limited to 'pkgs/development/python-modules/sphinx')
-rw-r--r--pkgs/development/python-modules/sphinx/default.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index ae08db31b2a8..605ab3b3a602 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -20,18 +20,21 @@
 , whoosh
 , imagesize
 , requests
+, sphinxcontrib-websupport
 }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.5.2";
+  version = "1.6.3";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722";
+    sha256 = "af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6";
   };
   LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
+
+  checkInputs = [ pytest ];
+  buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
   # Disable two tests that require network access.
   checkPhase = ''
     cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
@@ -48,8 +51,12 @@ buildPythonPackage rec {
     whoosh
     imagesize
     requests
+    sphinxcontrib-websupport
   ];
 
+  # Lots of tests. Needs network as well at some point.
+  doCheck = false;
+
   # https://github.com/NixOS/nixpkgs/issues/22501
   # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
   postPatch = ''