docs: updated packages.

docs/pip2nix.ini

@@ -0,0 +1,3 b''
+[pip2nix]
+requirements = -r ./requirements_docs.txt
+output = ./python-packages-generated.nix

docs/python-packages-generated.nix

@@ -0,0 +1,221 b''
+# Generated by pip2nix 0.8.0.dev1
+# See https://github.com/johbo/pip2nix
+
+{ pkgs, fetchurl, fetchgit, fetchhg }:
+
+self: super: {
+  "alabaster" = super.buildPythonPackage {
+    name = "alabaster-0.7.11";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3f/46/9346ea429931d80244ab7f11c4fce83671df0b7ae5a60247a2b588592c46/alabaster-0.7.11.tar.gz";
+      sha256 = "1mvm69xsn5xf1jc45kdq1mn0yq0pfn54mv2jcww4s1vwqx6iyfxn";
+    };
+  };
+  "babel" = super.buildPythonPackage {
+    name = "babel-2.6.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pytz"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/be/cc/9c981b249a455fa0c76338966325fc70b7265521bad641bf2932f77712f4/Babel-2.6.0.tar.gz";
+      sha256 = "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc";
+    };
+  };
+  "certifi" = super.buildPythonPackage {
+    name = "certifi-2018.8.24";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/e1/0f/f8d5e939184547b3bdc6128551b831a62832713aa98c2ccdf8c47ecc7f17/certifi-2018.8.24.tar.gz";
+      sha256 = "0f0nhrj9mlrf79iway4578wrsgmjh0fmacl9zv8zjckdy7b90rip";
+    };
+  };
+  "chardet" = super.buildPythonPackage {
+    name = "chardet-3.0.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
+      sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
+    };
+  };
+  "docutils" = super.buildPythonPackage {
+    name = "docutils-0.14";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
+      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
+    };
+  };
+  "idna" = super.buildPythonPackage {
+    name = "idna-2.7";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935/idna-2.7.tar.gz";
+      sha256 = "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8";
+    };
+  };
+  "imagesize" = super.buildPythonPackage {
+    name = "imagesize-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/41/f5/3cf63735d54aa9974e544aa25858d8f9670ac5b4da51020bbfc6aaade741/imagesize-1.1.0.tar.gz";
+      sha256 = "1dg3wn7qpwmhgqc0r9na2ding1wif9q5spz3j9zn2riwphc2k0zk";
+    };
+  };
+  "jinja2" = super.buildPythonPackage {
+    name = "jinja2-2.9.6";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."markupsafe"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
+    };
+  };
+  "markupsafe" = super.buildPythonPackage {
+    name = "markupsafe-1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
+    };
+  };
+  "packaging" = super.buildPythonPackage {
+    name = "packaging-17.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pyparsing"
+      self."six"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/77/32/439f47be99809c12ef2da8b60a2c47987786d2c6c9205549dd6ef95df8bd/packaging-17.1.tar.gz";
+      sha256 = "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh";
+    };
+  };
+  "pygments" = super.buildPythonPackage {
+    name = "pygments-2.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
+    };
+  };
+  "pyparsing" = super.buildPythonPackage {
+    name = "pyparsing-2.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz";
+      sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
+    };
+  };
+  "pytz" = super.buildPythonPackage {
+    name = "pytz-2018.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz";
+      sha256 = "0jgpqx3kk2rhv81j1izjxvmx8d0x7hzs1857pgqnixic5wq2ar60";
+    };
+  };
+  "requests" = super.buildPythonPackage {
+    name = "requests-2.19.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."chardet"
+      self."idna"
+      self."urllib3"
+      self."certifi"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/54/1f/782a5734931ddf2e1494e4cd615a51ff98e1879cbe9eecbdfeaf09aa75e9/requests-2.19.1.tar.gz";
+      sha256 = "0snf8xxdzsgh1x2zv3vilvbrv9jbpmnfagzzb1rjmmvflckdh8pc";
+    };
+  };
+  "setuptools" = super.buildPythonPackage {
+    name = "setuptools-40.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ef/1d/201c13e353956a1c840f5d0fbf0461bd45bbd678ea4843ebf25924e8984c/setuptools-40.2.0.zip";
+      sha256 = "19ng5m7kigllg3x96c91y3a2k28g6kwnbb1v4warrnp4xma1v227";
+    };
+  };
+  "six" = super.buildPythonPackage {
+    name = "six-1.11.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
+    };
+  };
+  "snowballstemmer" = super.buildPythonPackage {
+    name = "snowballstemmer-1.2.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
+      sha256 = "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi";
+    };
+  };
+  "sphinx" = super.buildPythonPackage {
+    name = "sphinx-1.7.8";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."six"
+      self."jinja2"
+      self."pygments"
+      self."docutils"
+      self."snowballstemmer"
+      self."babel"
+      self."alabaster"
+      self."imagesize"
+      self."requests"
+      self."setuptools"
+      self."packaging"
+      self."sphinxcontrib-websupport"
+      self."typing"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ac/54/4ef326d0c654da1ed91341a7a1f43efc18a8c770ddd2b8e45df97cb79d82/Sphinx-1.7.8.tar.gz";
+      sha256 = "1ryz0w4c31930f1br2sjwrxwx9cmsy7cqdb0d81g98n9bj250w50";
+    };
+  };
+  "sphinx-rtd-theme" = super.buildPythonPackage {
+    name = "sphinx-rtd-theme-0.4.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."sphinx"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/f2/b0/a1933d792b806118ddbca6699f2e2c844d9b1b16e84a89d7effd5cd2a800/sphinx_rtd_theme-0.4.1.tar.gz";
+      sha256 = "1xkyqam8dzbjaymdyvkiif85m4y3jf8crdiwlgcfp8gqcj57aj9v";
+    };
+  };
+  "sphinxcontrib-websupport" = super.buildPythonPackage {
+    name = "sphinxcontrib-websupport-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/07/7a/e74b06dce85555ffee33e1d6b7381314169ebf7e31b62c18fcb2815626b7/sphinxcontrib-websupport-1.1.0.tar.gz";
+      sha256 = "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x";
+    };
+  };
+  "typing" = super.buildPythonPackage {
+    name = "typing-3.6.6";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/bf/9b/2bf84e841575b633d8d91ad923e198a415e3901f228715524689495b4317/typing-3.6.6.tar.gz";
+      sha256 = "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0";
+    };
+  };
+  "urllib3" = super.buildPythonPackage {
+    name = "urllib3-1.23";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3c/d2/dc5471622bd200db1cd9319e02e71bc655e9ea27b8e0ce65fc69de0dac15/urllib3-1.23.tar.gz";
+      sha256 = "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6";
+    };
+  };
+
+### Test requirements
+
+  
+}

docs/.howto

@@ -1,4 +1,9 b''
+# generating packages
+nix-shell pkgs/shell-generate.nix
+cd docs
+pip2nix generate
+
 # building the docs
 cd docs
 nix-build default.nix -o result
-make clean html
  No newline at end of file
+make clean html

docs/conf.py

@@ -1,316 +1,311 b''
 # -*- coding: utf-8 -*-
 #
 # RhodeCode Enterprise documentation build configuration file, created by
 # sphinx-quickstart on Tue Nov  4 11:48:37 2014.
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
 import sys
 import os
 import datetime
 import sphinx_rtd_theme
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('.'))
 import common
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.imgmath'
 ]
 
 intersphinx_mapping = {
     'enterprise': ('https://docs.rhodecode.com/RhodeCode-Enterprise/', None),
     'control': ('https://docs.rhodecode.com/RhodeCode-Control/', None),
 }
 
-if tags.has('dev'):
-    intersphinx_mapping.update({
-        'enterprise': ('https://ci.rhodecode.com/documentation/Momentum/', None),
-        'control': ('https://ci.rhodecode.com/documentation/Control/', None),
-    })
-
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
 
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
 # The master toctree document.
 master_doc = 'index'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 
-# TODO: johbo: Move into common package for documentation utilities
+
 def _get_version():
     with open('../rhodecode/VERSION') as f:
         return f.read().strip()
 
+
 # The full version, including alpha/beta/rc tags.
 release = _get_version()
 # The short X.Y version.
 version = '.'.join(release.split('.', 2)[:2])  # First two parts of release
 
 # General information about the project.
 project = u'RhodeCode Enterprise %s ' % _get_version()
 copyright = u'2010-{now.year}, RhodeCode GmbH'.format(
     now=datetime.datetime.today())
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
 
 rst_epilog = common.rst_epilog + """
 .. |async| replace:: asynchronous
 """
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
 #today = ''
 # Else, today_fmt is used as the format for a strftime call.
 #today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = [
     # Special directories
     '_build',
     'result',
 
     # Other RST files
     'admin/rhodecode-backup.rst',
     'issue-trackers/redmine.rst',
     'known-issues/error-msg-guide.rst',
     'tutorials/docs-build.rst',
     'integrations/example-ext.py',
     'collaboration/supported-workflows.rst',
 ]
 
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
 #default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 #add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
 #add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
 #show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
 keep_warnings = tags.has("dev")
 
 
 # -- Options for HTML output ----------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #html_theme = 'rctheme'
 html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #html_theme_options = {}
 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 #html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
 #html_logo = None
 html_sidebars = {
    '**': ['globaltoc.html'],
 }
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
 html_favicon = 'images/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['static/css/add.css']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
 #html_extra_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 #html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
 #html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
 #html_additional_pages = {}
 
 # If false, no module index is generated.
 #html_domain_indices = True
 
 # If false, no index is generated.
 #html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
 #html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
 #html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
 #html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
 #html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
 #html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'rhodecode-enterprise'
 
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
     'classoptions': ',oneside',
     'babel': '\\usepackage[english]{babel}',
 
 # The paper size ('letterpaper' or 'a4paper').
 #'papersize': 'letterpaper',
 
 # The font size ('10pt', '11pt' or '12pt').
 #'pointsize': '10pt',
 
 # Additional stuff for the LaTeX preamble.
 #'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'RhodeCodeEnterprise.tex', u'RhodeCode Enterprise',
    u'RhodeCode GmbH', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
 #latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
 #latex_use_parts = False
 
 # If true, show page references after internal links.
 latex_show_pagerefs = True
 
 # If true, show URL addresses after external links.
 latex_show_urls = 'footnote'
 
 # Documents to append as an appendix to all manuals.
 #latex_appendices = []
 
 # If false, no module index is generated.
 #latex_domain_indices = True
 
 # Mode for literal blocks wider than the frame. Can be
 # overflow, shrink or truncate
 pdf_fit_mode = "truncate"
 
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'rhodecodeenterprise', u'RhodeCode Enterprise',
      [u'RhodeCode GmbH'], 1)
 ]
 
 # If true, show URL addresses after external links.
 #man_show_urls = False
 
 
 # -- Options for Texinfo output -------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'RhodeCodeEnterprise', u'RhodeCode Enterprise',
    u'RhodeCode Docs Team', 'RhodeCodeEnterprise', 'RhodeCode Docs Project',
    'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
 #texinfo_appendices = []
 
 # If false, no module index is generated.
 #texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
 
 # We want to see todo notes in case of a pre-release build of the documentation
 todo_include_todos = tags.has("dev")

docs/default.nix

@@ -1,261 +1,227 b''
 { system ? builtins.currentSystem
 }:
 
 let
 
   pkgs = import <nixpkgs> { inherit system; };
 
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl;
 
   buildPythonPackage = pkgs.python27Packages.buildPythonPackage;
   python = pkgs.python27Packages.python;
 
-  Jinja2 = buildPythonPackage rec {
-    name = "Jinja2-2.9.6";
-    buildInputs = [];
+
+  alabaster = buildPythonPackage {
+    name = "alabaster-0.7.11";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3f/46/9346ea429931d80244ab7f11c4fce83671df0b7ae5a60247a2b588592c46/alabaster-0.7.11.tar.gz";
+      sha256 = "1mvm69xsn5xf1jc45kdq1mn0yq0pfn54mv2jcww4s1vwqx6iyfxn";
+    };
+  };
+  babel = buildPythonPackage {
+    name = "babel-2.6.0";
     doCheck = false;
-    propagatedBuildInputs = [MarkupSafe];
+    propagatedBuildInputs = [
+      pytz
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
-      md5 = "6411537324b4dba0956aaa8109f3c77b";
+      url = "https://files.pythonhosted.org/packages/be/cc/9c981b249a455fa0c76338966325fc70b7265521bad641bf2932f77712f4/Babel-2.6.0.tar.gz";
+      sha256 = "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc";
+    };
+  };
+  certifi = buildPythonPackage {
+    name = "certifi-2018.8.24";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/e1/0f/f8d5e939184547b3bdc6128551b831a62832713aa98c2ccdf8c47ecc7f17/certifi-2018.8.24.tar.gz";
+      sha256 = "0f0nhrj9mlrf79iway4578wrsgmjh0fmacl9zv8zjckdy7b90rip";
     };
   };
-
-  MarkupSafe = buildPythonPackage rec {
-    name = "MarkupSafe-1.0";
-    buildInputs = [];
+  chardet = buildPythonPackage {
+    name = "chardet-3.0.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
+      sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
+    };
+  };
+  docutils = buildPythonPackage {
+    name = "docutils-0.14";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
+      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
+    };
+  };
+  idna = buildPythonPackage {
+    name = "idna-2.7";
     doCheck = false;
-    propagatedBuildInputs = [];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935/idna-2.7.tar.gz";
+      sha256 = "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8";
+    };
+  };
+  imagesize = buildPythonPackage {
+    name = "imagesize-1.1.0";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
-      md5 = "2fcedc9284d50e577b5192e8e3578355";
+      url = "https://files.pythonhosted.org/packages/41/f5/3cf63735d54aa9974e544aa25858d8f9670ac5b4da51020bbfc6aaade741/imagesize-1.1.0.tar.gz";
+      sha256 = "1dg3wn7qpwmhgqc0r9na2ding1wif9q5spz3j9zn2riwphc2k0zk";
+    };
+  };
+  jinja2 = buildPythonPackage {
+    name = "jinja2-2.9.6";
+    doCheck = false;
+    propagatedBuildInputs = [
+      markupsafe
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
     };
   };
-
-  Pygments = buildPythonPackage {
-    name = "Pygments-2.2.0";
-    buildInputs = [];
+  markupsafe = buildPythonPackage {
+    name = "markupsafe-1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
+    };
+  };
+  packaging = buildPythonPackage {
+    name = "packaging-17.1";
     doCheck = false;
-    propagatedBuildInputs = [];
+    propagatedBuildInputs = [
+      pyparsing
+      six
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
-      md5 = "13037baca42f16917cbd5ad2fab50844";
+      url = "https://files.pythonhosted.org/packages/77/32/439f47be99809c12ef2da8b60a2c47987786d2c6c9205549dd6ef95df8bd/packaging-17.1.tar.gz";
+      sha256 = "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh";
+    };
+  };
+  pygments = buildPythonPackage {
+    name = "pygments-2.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
+    };
+  };
+  pyparsing = buildPythonPackage {
+    name = "pyparsing-2.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz";
+      sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
     };
   };
-
-  Sphinx = buildPythonPackage (rec {
-    name = "Sphinx-1.6.5";
+  pytz = buildPythonPackage {
+    name = "pytz-2018.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz";
+      sha256 = "0jgpqx3kk2rhv81j1izjxvmx8d0x7hzs1857pgqnixic5wq2ar60";
+    };
+  };
+  requests = buildPythonPackage {
+    name = "requests-2.19.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      chardet
+      idna
+      urllib3
+      certifi
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8b/7e/b188d9a3b9c938e736e02a74c1363c2888e095d770df2c72b4c312f9fdcb/Sphinx-1.6.5.tar.gz";
-      md5 = "cd73118c21ec610432e63e6421ec54f1";
+      url = "https://files.pythonhosted.org/packages/54/1f/782a5734931ddf2e1494e4cd615a51ff98e1879cbe9eecbdfeaf09aa75e9/requests-2.19.1.tar.gz";
+      sha256 = "0snf8xxdzsgh1x2zv3vilvbrv9jbpmnfagzzb1rjmmvflckdh8pc";
+    };
+  };
+  six = buildPythonPackage {
+    name = "six-1.11.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
+    };
     };
+  snowballstemmer = buildPythonPackage {
+    name = "snowballstemmer-1.2.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
+      sha256 = "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi";
+    };
+  };
+  sphinx = buildPythonPackage {
+    name = "sphinx-1.7.8";
+    doCheck = false;
     propagatedBuildInputs = [
         six
-        Jinja2
-        Pygments
+      jinja2
+      pygments
         docutils
         snowballstemmer
         babel
         alabaster
         imagesize
         requests
         setuptools
+      packaging
         sphinxcontrib-websupport
         typing
-
-        # special cases
-        pytz
-        sphinx_rtd_theme
-
     ];
-  });
-
-  alabaster = buildPythonPackage rec {
-    name = "alabaster-0.7.10";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d0/a5/e3a9ad3ee86aceeff71908ae562580643b955ea1b1d4f08ed6f7e8396bd7/alabaster-0.7.10.tar.gz";
-      md5 = "7934dccf38801faa105f6e7b4784f493";
+      url = "https://files.pythonhosted.org/packages/ac/54/4ef326d0c654da1ed91341a7a1f43efc18a8c770ddd2b8e45df97cb79d82/Sphinx-1.7.8.tar.gz";
+      sha256 = "1ryz0w4c31930f1br2sjwrxwx9cmsy7cqdb0d81g98n9bj250w50";
     };
   };
-
-  babel = buildPythonPackage {
-    name = "babel-2.5.1";
-    buildInputs = [];
+  sphinx-rtd-theme = buildPythonPackage {
+    name = "sphinx-rtd-theme-0.4.1";
     doCheck = false;
-    propagatedBuildInputs = [pytz];
+    propagatedBuildInputs = [
+      sphinx
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/5a/22/63f1dbb8514bb7e0d0c8a85cc9b14506599a075e231985f98afd70430e1f/Babel-2.5.1.tar.gz";
-      md5 = "60228b3ce93a203357158b909afe8ae1";
-    };
-  };
-
-  certifi = buildPythonPackage {
-    name = "certifi-2017.11.5";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/23/3f/8be01c50ed24a4bd6b8da799839066ce0288f66f5e11f0367323467f0cbc/certifi-2017.11.5.tar.gz";
-      md5 = "c15ac46ed1fe4b607ff3405928f9a992";
+      url = "https://files.pythonhosted.org/packages/f2/b0/a1933d792b806118ddbca6699f2e2c844d9b1b16e84a89d7effd5cd2a800/sphinx_rtd_theme-0.4.1.tar.gz";
+      sha256 = "1xkyqam8dzbjaymdyvkiif85m4y3jf8crdiwlgcfp8gqcj57aj9v";
     };
   };
-
-  chardet = buildPythonPackage {
-    name = "chardet-3.0.4";
-    buildInputs = [];
+  sphinxcontrib-websupport = buildPythonPackage {
+    name = "sphinxcontrib-websupport-1.1.0";
     doCheck = false;
-    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
-      md5 = "7dd1ba7f9c77e32351b0a0cfacf4055c";
+      url = "https://files.pythonhosted.org/packages/07/7a/e74b06dce85555ffee33e1d6b7381314169ebf7e31b62c18fcb2815626b7/sphinxcontrib-websupport-1.1.0.tar.gz";
+      sha256 = "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x";
     };
   };
-
-  docutils = buildPythonPackage {
-    name = "docutils-0.14";
-    buildInputs = [];
+  typing = buildPythonPackage {
+    name = "typing-3.6.6";
     doCheck = false;
-    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
-      md5 = "c53768d63db3873b7d452833553469de";
+      url = "https://files.pythonhosted.org/packages/bf/9b/2bf84e841575b633d8d91ad923e198a415e3901f228715524689495b4317/typing-3.6.6.tar.gz";
+      sha256 = "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0";
     };
   };
-
-  idna = buildPythonPackage {
-    name = "idna-2.6";
-    buildInputs = [];
+  urllib3 = buildPythonPackage {
+    name = "urllib3-1.23";
     doCheck = false;
-    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/bd/0467d62790828c23c47fc1dfa1b1f052b24efdf5290f071c7a91d0d82fd3/idna-2.6.tar.gz";
-      md5 = "c706e2790b016bd0ed4edd2d4ba4d147";
-    };
-  };
-
-  imagesize = buildPythonPackage {
-    name = "imagesize-0.7.1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-0.7.1.tar.gz";
-      md5 = "976148283286a6ba5f69b0f81aef8052";
+      url = "https://files.pythonhosted.org/packages/3c/d2/dc5471622bd200db1cd9319e02e71bc655e9ea27b8e0ce65fc69de0dac15/urllib3-1.23.tar.gz";
+      sha256 = "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6";
     };
   };
 
-  pytz = buildPythonPackage {
-    name = "pytz-2017.3";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/60/88/d3152c234da4b2a1f7a989f89609ea488225eaea015bc16fbde2b3fdfefa/pytz-2017.3.zip";
-      md5 = "7006b56c0d68a162d9fe57d4249c3171";
-    };
-  };
-
-  requests = buildPythonPackage {
-    name = "requests-2.18.4";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [chardet idna urllib3 certifi];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/b0/e1/eab4fc3752e3d240468a8c0b284607899d2fbfb236a56b7377a329aa8d09/requests-2.18.4.tar.gz";
-      md5 = "081412b2ef79bdc48229891af13f4d82";
-    };
-  };
-
-  six = buildPythonPackage {
-    name = "six-1.11.0";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
-      md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
-    };
-  };
-
-  snowballstemmer = buildPythonPackage {
-    name = "snowballstemmer-1.2.1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
-      md5 = "643b019667a708a922172e33a99bf2fa";
-    };
-  };
-
-  sphinx-rtd-theme = buildPythonPackage {
-    name = "sphinx-rtd-theme-0.2.5b1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/59/e4/9e3a74a3271e6734911d3f549e8439db53b8ac29adf10c8f698e6c86246b/sphinx_rtd_theme-0.2.5b1.tar.gz";
-      md5 = "0923473a43bd2527f32151f195f2a521";
-    };
-  };
-
-  sphinxcontrib-websupport = buildPythonPackage {
-    name = "sphinxcontrib-websupport-1.0.1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/c5/6b/f0630436b931ad4f8331a9399ca18a7d447f0fcc0c7178fb56b1aee68d01/sphinxcontrib-websupport-1.0.1.tar.gz";
-      md5 = "84df26463b1ba65b07f926dbe2055665";
-    };
-  };
-
-  typing = buildPythonPackage {
-    name = "typing-3.6.2";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/ca/38/16ba8d542e609997fdcd0214628421c971f8c395084085354b11ff4ac9c3/typing-3.6.2.tar.gz";
-      md5 = "143af0bf3afd1887622771f2f1ffe8e1";
-    };
-  };
-
-  urllib3 = buildPythonPackage {
-    name = "urllib3-1.22";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/ee/11/7c59620aceedcc1ef65e156cc5ce5a24ef87be4107c2b74458464e437a5d/urllib3-1.22.tar.gz";
-      md5 = "0da7bed3fe94bf7dc59ae37885cc72f7";
-    };
-  };
-
-
-  sphinx_rtd_theme = buildPythonPackage rec {
-    name = "sphinx-rtd-theme-0.2.5b1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/59/e4/9e3a74a3271e6734911d3f549e8439db53b8ac29adf10c8f698e6c86246b/sphinx_rtd_theme-0.2.5b1.tar.gz";
-      md5 = "0923473a43bd2527f32151f195f2a521";
-    };
-
-
-  };
   # Avoid that setuptools is replaced, this leads to trouble
   # with buildPythonPackage.
   setuptools = pkgs.python27Packages.setuptools;
 
 in python.buildEnv.override {
   inherit python;
   extraLibs = [
-    Sphinx
-    sphinx_rtd_theme
+    sphinx
+    sphinx-rtd-theme
   ];
-}
+}
  No newline at end of file

docs/requirements_docs.txt

@@ -1,8 +1,8 b''
-Sphinx==1.6.5
+sphinx==1.7.8
 six==1.11.0
-sphinx_rtd_theme==0.2.5b1
+sphinx_rtd_theme==0.4.1
 docutils==0.14.0
-Pygments==2.2.0
-MarkupSafe==1.0.0
-Jinja2==2.9.6
-pytz
  No newline at end of file
+pygments==2.2.0
+markupsafe==1.0.0
+jinja2==2.9.6
+pytz==2018.4