release: Merge default into stable for release preparation

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/release-notes/release-notes-4.13.0.rst

@@ -0,0 +1,133 b''
+|RCE| 4.13.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2018-09-05
+
+
+New Features
+^^^^^^^^^^^^
+
+- Branch permissions: new set of permissions were added to control branch modification.
+  There are 4 basic permissions that can be set for branch names/branch patterns:
+  * no-access (any modification for given branch is forbidden)
+  * web-merge (modify branch by web based PR merge)
+  * push (only non-forced modification on branch are allowed)
+  * forced push (all modification to branch are allowed)
+  Available in EE edition only.
+- Unified search and repo-switcher: a new persistent search box is now present allowing
+  to search for repositories, repository groups, commits (using full text search),
+  users, user-groups. Replaces redundant quick-filters/repo switcher.
+- Default Reviewers: added possibility to match against regex based pattern as
+  alternative syntax to glob which didn't handle all the cases.
+- Built-in Error tracker: added new exception tracking capability. All errors are now
+  tracked and stored. This allows instance admins to see potential problems without
+  access to the machine and logs.
+- User Groups: each user group which users have access to expose public profile link.
+  It's possible to view the members of a group before attaching it to any resource.
+- New caching framework: existing Beaker cache was completely replaced by dogpile.cache
+  library. This new cache framework in addition to solving multiple
+  performance/reliability problems of Beaker is used to cache permissions tree.
+  This gives huge performance boosts for very large and complex permission trees.
+- Pull Requests: description field is now allowed to use a RST/Markdown syntax.
+- SVN: added support for SVN 1.10 release line.
+
+
+General
+^^^^^^^
+
+- Google: updated google auth plugin with latest API changes.
+- Frontend: Switched to Polymer 2.0.
+- Events: added a default timeout for operation calling the endpoint url, so
+  they won't block forever.
+- SQLAlchemy: allow DB connection ping/refresh using dedicated flag from .ini file.
+  `sqlalchemy.db1.ping_connection = true`
+- Pull Requests: added option to force-refresh merge workspace in case of problems.
+  Adding GET param `?force_refresh=1` into PR page triggers the refresh.
+- Pull Requests: show more info about version of comment vs latest version.
+- Diffs: skip line numbers during copy from a diff view.
+- License: use simple cache to read license info.
+  Due to the complex and expensive encryption, this reduces requests time by ~10ms.
+- Debug: add new custom logging to track unique requests across systems.
+  Allows tracking single requests in very busy system by unique ID added into logging system.
+- Configuration: .ini files now can replace a special placeholders e.g "{ENV_NAME}"
+  into a value from the ENVIRONMENT. Allows easier setup in Docker and similar.
+- Backend: don't support vcsserver.scm_app anymore, now it uses http even if scm_app
+  is specified.
+- Repositories: re-order creation/fork forms for better UX and consistency.
+- UI: Add the number of inactive users in _admin/users and _admin/user_groups
+- UX: updated registration form to better indicate what is the process of binding a
+  RhodeCode account with external one like Google.
+- API: pull-requests allow automatic title generation via API
+- VCSServer: errors: use a better interface to track exceptions and tracebacks.
+- VCSServer: caches: replaced beaker with dogpile cache.
+- GIT: use GIT_DISCOVERY_ACROSS_FILESYSTEM for better compatibility on NFS servers.
+- Dependencies: bumped mercurial to 4.6.2
+- Dependencies: bumped evolve to 8.0.1
+- Dependencies: bumped hgsubversion to 1.9.2
+- Dependencies: bumped git version to 2.16.4
+- Dependencies: bumped SVN to 1.10.2
+- Dependencies: added alternative pymysql drivers for mysql
+- NIX: updated to 18.03 nix packages, now shipped with python 2.7.15
+  release and multiple other new libraries.
+
+
+Security
+^^^^^^^^
+
+- Mercurial: general protocol security updates.
+  * Fixes Mercurial's CVE for lack of permissions checking on mercurial batch commands.
+  * Introduced more strict checks for permissions, now they default to push instead of pull.
+  * Decypher batch commands and pick top-most permission to be required.
+  * This follows changes in Mercurial CORE after 4.6.1 release.
+- Fixed bug in bleach sanitizer allowing certain custom payload to bypass it. Now
+  we always fails if sanitizing fails. This could lead to stored XSS
+- Fixed stored XSS in binary file rendering.
+- Fixed stored XSS in repo forks datagrid.
+
+
+Performance
+^^^^^^^^^^^
+
+- Permissions: Permission trees for users and now cached, after calculation.
+  This reduces response time for some pages dramatically.
+  In case of any permission changes caches are invalidated.
+- Core: new dogpile.cache based cache framework was introduced, which is faster than
+  previously used Beaker.
+
+
+Fixes
+^^^^^
+
+- Audit Logs: store properly IP for certain events.
+- External Auth: pass along came_from into the url so we get properly
+  redirected back after logging using external auth provider.
+- Pull Requests: lock submit on pull request to prevent double submission on a fast click.
+- Pull Requests: fixed a case of unresolved comments attached to removed file in pull request.
+  That prevented from closing it.
+- Pull Requests: use numeric repo id for creation of shadow repos. Fixes a problem
+  when repository is renamed during PR lifetime.
+- API: fixed creation of a pull request with default reviewer rules.
+- Default Reviewers: fixed voting rule calculation on user group.
+- Pull Requests: in GIT use force fetch and update for target ref.
+  This solves a case when in PR a target repository is force updated (by push force)
+  and is out of sync.
+- VCSServer: detect early potential locale problem, and fallback to LC_ALL=C,
+  instead of crashing vcsserver.
+- Pull Requests: use a safer way of destroying shadow repositories.
+  Fixes some problems in NFS storage and big repositories
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- The direct backend `vcsserver.scm_app` is not supported anymore. This backed was
+  already deprecated some time ago. Now it will use `http` mode even if scm_app is
+  specified. Please contact us in case you still use it, and not sure how to upgrade.
+- New dogpile cache settings are not ported to converted .ini. If users want to do
+  adjustments please copy the settings over dogpile cache section from a newly
+  generated rhodecode.template.ini file. This file is stored next to rhodecode.ini
+- SVN 1.10.2 was introduced in this release. Please make sure to update your
+  mod_dav to the same version for best compatibility.

pkgs/README.rst

@@ -0,0 +1,52 b''
+
+==============================
+ Generate the Nix expressions
+==============================
+
+Details can be found in the repository of `RhodeCode Enterprise CE`_ inside of
+the file `docs/contributing/dependencies.rst`.
+
+Start the environment as follows:
+
+.. code:: shell
+
+   nix-shell pkgs/shell-generate.nix
+
+
+
+Python dependencies
+===================
+
+.. code:: shell
+
+   pip2nix generate --licenses
+   # or
+   nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
+
+
+NodeJS dependencies
+===================
+
+.. code:: shell
+
+   rm -rf node_modules
+   nix-shell pkgs/shell-generate.nix --command "
+       node2nix --input package.json \
+                -o pkgs/node-packages.nix \
+                -e pkgs/node-env.nix \
+                -c pkgs/node-default.nix \
+                -d --flatten --nodejs-6 "
+
+
+
+Bower dependencies
+==================
+
+.. code:: shell
+
+   nix-shell pkgs/shell-generate.nix --command "bower2nix bower.json pkgs/bower-packages.nix"
+
+
+.. Links
+
+.. _RhodeCode Enterprise CE: https://code.rhodecode.com/rhodecode-enterprise-ce

pkgs/nix-common/pip2nix.nix

@@ -0,0 +1,17 b''
+{ pkgs
+, pythonPackages
+}:
+
+rec {
+  pip2nix-src = pkgs.fetchzip {
+    url = https://github.com/johbo/pip2nix/archive/51e6fdae34d0e8ded9efeef7a8601730249687a6.tar.gz;
+    sha256 = "02a4jjgi7lsvf8mhrxsd56s9a3yg20081rl9bgc2m84w60v2gbz2";
+  };
+
+  pip2nix = import pip2nix-src {
+    inherit
+      pkgs
+      pythonPackages;
+  };
+
+}

pkgs/patch_beaker/patch-beaker-metadata-reuse.diff

@@ -0,0 +1,13 b''
+diff -rup Beaker-1.9.1-orig/beaker/ext/database.py Beaker-1.9.1/beaker/ext/database.py
+--- Beaker-1.9.1-orig/beaker/ext/database.py	2018-05-22 18:22:34.802619619 +0200
++++ Beaker-1.9.1/beaker/ext/database.py	2018-05-22 17:07:14.048335196 +0200
+@@ -91,7 +91,8 @@ class DatabaseNamespaceManager(OpenResou
+                              sa.Column('created', types.DateTime, nullable=False),
+                              sa.Column('data', types.PickleType, nullable=False),
+                              sa.UniqueConstraint('namespace'),
+-                             schema=schema_name if schema_name else meta.schema
++                             schema=schema_name if schema_name else meta.schema,
++                             extend_existing=True
+             )
+             cache.create(checkfirst=True)
+             return cache

pkgs/shell-generate.nix

@@ -0,0 +1,53 b''
+{ pkgs ? (import <nixpkgs> {})
+, pythonPackages ? "python27Packages"
+}:
+
+with pkgs.lib;
+
+let _pythonPackages = pythonPackages; in
+let
+  pythonPackages = getAttr _pythonPackages pkgs;
+
+  pip2nix = import ./nix-common/pip2nix.nix {
+    inherit
+      pkgs
+      pythonPackages;
+  };
+
+in
+
+pkgs.stdenv.mkDerivation {
+  name = "pip2nix-generated";
+  buildInputs = [
+    # Allows to generate python packages
+    pip2nix.pip2nix
+    pythonPackages.pip-tools
+
+    # Allows to generate bower dependencies
+    pkgs.nodePackages.bower2nix
+
+    # Allows to generate node dependencies
+    pkgs.nodePackages.node2nix
+
+    # We need mysql_config to be around
+    pkgs.mysql
+
+    # We need postgresql to be around
+    pkgs.postgresql
+
+    # Curl is needed for pycurl
+    pkgs.curl
+  ];
+
+  shellHook = ''
+    runHook preShellHook
+    runHook postShellHook
+  '';
+
+  preShellHook = ''
+    echo "Starting Generate Shell"
+    # Custom prompt to distinguish from other dev envs.
+    export PS1="\n\[\033[1;32m\][Generate-shell:\w]$\[\033[0m\] "
+    export PYCURL_SSL_LIBRARY=openssl
+  '';
+}

.bumpversion.cfg

@@ -1,5 +1,5 b''
 [bumpversion]
-current_version = 4.12.4
+current_version = 4.13.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:rhodecode/VERSION]

.release.cfg

@@ -5,25 +5,20 b' done = false'
 done = true
 
 [task:rc_tools_pinned]
-done = true
 
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [task:changelog_updated]
-done = true
 
 [task:generate_api_docs]
-done = true
+
+[task:updated_translation]
 
 [release]
-state = prepared
-version = 4.12.4
-
-[task:updated_translation]
+state = in_progress
+version = 4.13.0
 
 [task:generate_js_routes]
 

MANIFEST.in

@@ -26,6 +26,8 b' recursive-include rhodecode *.mako'
 # 502 page
 include rhodecode/public/502.html
 
+# robots
+include rhodecode/public/robots.txt
 
 # images, css
 include rhodecode/public/css/*.css

README.rst

@@ -7,8 +7,9 b' About'
 
 ``RhodeCode`` is a fast and powerful management tool for Mercurial_ and GIT_
 and Subversion_ with a built in push/pull server, full text search,
-pull requests and powerfull code-review system. It works on http/https and
+pull requests and powerful code-review system. It works on http/https and
 has a few unique features like:
+
  - plugable architecture
  - advanced permission system with IP restrictions
  - rich set of authentication plugins including LDAP,
@@ -78,10 +79,9 b' Listed bellow are various support resour'
 
 - Official issue tracker `RhodeCode Issue tracker <https://issues.rhodecode.com>`_
 
-- Search our community portal `Community portal <https://community.rhodecode.com>`_
+- Official Slack Community Channel `RhodeCode Slack <https://rhodecode.com/join>`_
 
-- Join #rhodecode on FreeNode (irc.freenode.net)
-  or use http://webchat.freenode.net/?channels=rhodecode for web access to irc.
+- Search our community portal `Community portal <https://community.rhodecode.com>`_
 
 - You can also follow RhodeCode on twitter **@RhodeCode** where we often post
   news and other interesting stuff about RhodeCode.

bower.json

@@ -3,15 +3,15 b''
   "description": "User interface for elements for rhodecode",
   "main": "index.html",
   "dependencies": {
-    "webcomponentsjs": "^0.7.22",
-    "polymer": "Polymer/polymer#^1.6.1",
-    "paper-button": "PolymerElements/paper-button#^1.0.13",
-    "paper-spinner": "PolymerElements/paper-spinner#^1.2.0",
-    "paper-tooltip": "PolymerElements/paper-tooltip#^1.1.2",
-    "paper-toast": "PolymerElements/paper-toast#^1.3.0",
-    "paper-toggle-button": "PolymerElements/paper-toggle-button#^1.2.0",
-    "iron-ajax": "PolymerElements/iron-ajax#^1.4.3",
-    "iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^1.0.13",
-    "iron-a11y-keys": "PolymerElements/iron-a11y-keys#^1.0.6"
+    "webcomponentsjs": "^1.2.3",
+    "polymer": "Polymer/polymer#^2.6.0",
+    "paper-button": "PolymerElements/paper-button#^2.1.2",
+    "paper-spinner": "PolymerElements/paper-spinner#^2.1.0",
+    "paper-tooltip": "PolymerElements/paper-tooltip#^2.1.1",
+    "paper-toast": "PolymerElements/paper-toast#^2.1.2",
+    "paper-toggle-button": "PolymerElements/paper-toggle-button#^2.1.1",
+    "iron-ajax": "PolymerElements/iron-ajax#^2.1.3",
+    "iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^2.2.0",
+    "iron-a11y-keys": "PolymerElements/iron-a11y-keys#^2.1.2"
   }
 }

configs/development.ini

@@ -2,7 +2,6 b''
 
 ################################################################################
 ##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
-# The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 
 [DEFAULT]
@@ -46,10 +45,9 b' debug = true'
 host = 127.0.0.1
 port = 5000
 
-##################################
-##     WAITRESS WSGI SERVER     ##
-## Recommended for Development  ##
-##################################
+###########################################################
+## WAITRESS WSGI SERVER - Recommended for Development  ####
+###########################################################
 
 use = egg:waitress#main
 ## number of worker threads
@@ -67,15 +65,15 b' asyncore_use_poll = true'
 ## run with gunicorn --log-config rhodecode.ini --paste rhodecode.ini
 
 #use = egg:gunicorn#main
-## Sets the number of process workers. You must set `instance_id = *`
-## when this option is set to more than one worker, recommended
-## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
-## The `instance_id = *` must be set in the [app:main] section below
+## Sets the number of process workers. More workers means more concurent connections
+## RhodeCode can handle at the same time. Each additional worker also it increases
+## memory usage as each has it's own set of caches.
+## Recommended value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers, but no more
+## than 8-10 unless for really big deployments .e.g 700-1000 users.
+## `instance_id = *` must be set in the [app:main] section below (which is the default)
+## when using more than 1 worker.
 #workers = 2
-## number of threads for each of the worker, must be set to 1 for gevent
-## generally recommended to be at 1
-#threads = 1
-## process name
+## process name visible in process list
 #proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
@@ -103,6 +101,11 b' use = egg:PasteDeploy#prefix'
 prefix = /
 
 [app:main]
+## The %(here)s variable will be replaced with the absolute path of parent directory
+## of this file
+## In addition ENVIRONMENT variables usage is possible, e.g
+## sqlalchemy.db1.url = {ENV_RC_DB_URL}
+
 use = egg:rhodecode-enterprise-ce
 
 ## enable proxy prefix middleware, defined above
@@ -148,12 +151,12 b' gzip_responses = false'
 ## autogenerate javascript routes file on startup
 generate_js_files = false
 
-## Optional Languages
-## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
+## System global default language.
+## All available languages: en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
 lang = en
 
-## perform a full repository scan on each server start, this should be
-## set to false after first startup, to allow faster server restarts.
+## Perform a full repository scan and import on each server start.
+## Settings this to true could lead to very long startup time.
 startup.import_repos = false
 
 ## Uncomment and set this path to use archive download cache.
@@ -167,23 +170,23 b' startup.import_repos = false'
 ## SSH calls. Set this for events to receive proper url for SSH calls.
 app.base_url = http://rhodecode.local
 
-## change this to unique ID for security
+## Unique application ID. Should be a random unique string for security.
 app_instance_uuid = rc-production
 
-## cut off limit for large diffs (size in bytes). If overall diff size on
+## Cut off limit for large diffs (size in bytes). If overall diff size on
 ## commit, or pull request exceeds this limit this diff will be displayed
 ## partially. E.g 512000 == 512Kb
 cut_off_limit_diff = 512000
 
-## cut off limit for large files inside diffs (size in bytes). Each individual
+## Cut off limit for large files inside diffs (size in bytes). Each individual
 ## file inside diff which exceeds this limit will be displayed partially.
 ##  E.g 128000 == 128Kb
 cut_off_limit_file = 128000
 
-## use cache version of scm repo everywhere
+## use cached version of vcs repositories everywhere. Recommended to be `true`
 vcs_full_cache = true
 
-## force https in RhodeCode, fixes https redirects, assumes it's always https
+## Force https in RhodeCode, fixes https redirects, assumes it's always https.
 ## Normally this is controlled by proper http flags sent from http server
 force_https = false
 
@@ -230,7 +233,7 b' gist_alias_url ='
 #    GistView:*
 api_access_controllers_whitelist =
 
-## default encoding used to convert from and to unicode
+## Default encoding used to convert from and to unicode
 ## can be also a comma separated list of encoding in case of mixed encodings
 default_encoding = UTF-8
 
@@ -277,8 +280,8 b' allow_repo_location_change = true'
 ## allows to setup custom hooks in settings page
 allow_custom_hooks_settings = true
 
-## generated license token, goto license page in RhodeCode settings to obtain
-## new token
+## Generated license token required for EE edition license.
+## New generated token value can be found in Admin > settings > license page.
 license_token =
 
 ## supervisor connection uri, for managing supervisor and logs.
@@ -308,65 +311,66 b' celery.max_tasks_per_child = 100'
 ## tasks will never be sent to the queue, but executed locally instead.
 celery.task_always_eager = false
 
-####################################
-###         BEAKER CACHE        ####
-####################################
-# default cache dir for templates.  Putting this into a ramdisk
-## can boost performance, eg. %(here)s/data_ramdisk
+#####################################
+###         DOGPILE CACHE        ####
+#####################################
+## Default cache dir for caches.  Putting this into a ramdisk
+## can boost performance, eg. /tmpfs/data_ramdisk, however this directory might require
+## large amount of space
 cache_dir = %(here)s/data
 
-## locking and default file storage for Beaker. Putting this into a ramdisk
-## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
-beaker.cache.data_dir = %(here)s/data/cache/beaker_data
-beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
-
-beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
+## `cache_perms` cache settings for permission tree, auth TTL.
+rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_perms.expiration_time = 300
 
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 10
-beaker.cache.super_short_term.key_length = 256
+## alternative `cache_perms` redis backend with distributed lock
+#rc_cache.cache_perms.backend = dogpile.cache.rc.redis
+#rc_cache.cache_perms.expiration_time = 300
+## redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_perms.arguments.redis_expiration_time = 7200
+#rc_cache.cache_perms.arguments.socket_timeout = 30
+#rc_cache.cache_perms.arguments.host = localhost
+#rc_cache.cache_perms.arguments.port = 6379
+#rc_cache.cache_perms.arguments.db = 0
+#rc_cache.cache_perms.arguments.distributed_lock = true
 
-beaker.cache.short_term.type = memory
-beaker.cache.short_term.expire = 60
-beaker.cache.short_term.key_length = 256
-
-beaker.cache.long_term.type = memory
-beaker.cache.long_term.expire = 36000
-beaker.cache.long_term.key_length = 256
+## `cache_repo` cache settings for FileTree, Readme, RSS FEEDS
+rc_cache.cache_repo.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_repo.expiration_time = 2592000
 
-beaker.cache.sql_cache_short.type = memory
-beaker.cache.sql_cache_short.expire = 10
-beaker.cache.sql_cache_short.key_length = 256
+## alternative `cache_repo` redis backend with distributed lock
+#rc_cache.cache_repo.backend = dogpile.cache.rc.redis
+#rc_cache.cache_repo.expiration_time = 2592000
+## redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_repo.arguments.redis_expiration_time = 2678400
+#rc_cache.cache_repo.arguments.socket_timeout = 30
+#rc_cache.cache_repo.arguments.host = localhost
+#rc_cache.cache_repo.arguments.port = 6379
+#rc_cache.cache_repo.arguments.db = 1
+#rc_cache.cache_repo.arguments.distributed_lock = true
 
-## default is memory cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.auth_plugins.type = ext:database
-#beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
-#beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
-#beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
-#beaker.cache.auth_plugins.sa.pool_recycle = 3600
-#beaker.cache.auth_plugins.sa.pool_size = 10
-#beaker.cache.auth_plugins.sa.max_overflow = 0
+## cache settings for SQL queries, this needs to use memory type backend
+rc_cache.sql_cache_short.backend = dogpile.cache.rc.memory_lru
+rc_cache.sql_cache_short.expiration_time = 30
 
-beaker.cache.repo_cache_long.type = memorylru_base
-beaker.cache.repo_cache_long.max_items = 4096
-beaker.cache.repo_cache_long.expire = 2592000
+## `cache_repo_longterm` cache for repo object instances, this needs to use memory
+## type backend as the objects kept are not pickle serializable
+rc_cache.cache_repo_longterm.backend = dogpile.cache.rc.memory_lru
+## by default we use 96H, this is using invalidation on push anyway
+rc_cache.cache_repo_longterm.expiration_time = 345600
+## max items in LRU cache, reduce this number to save memory, and expire last used
+## cached objects
+rc_cache.cache_repo_longterm.max_size = 10000
 
-## default is memorylru_base cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.repo_cache_long.type = ext:memcached
-#beaker.cache.repo_cache_long.url = localhost:11211
-#beaker.cache.repo_cache_long.expire = 1209600
-#beaker.cache.repo_cache_long.key_length = 256
 
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
-## types are file, ext:memcached, ext:database, and memory (default).
+## types are file, ext:memcached, ext:redis, ext:database, and memory (default).
 beaker.session.type = file
-beaker.session.data_dir = %(here)s/data/sessions/data
+beaker.session.data_dir = %(here)s/data/sessions
 
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
@@ -502,10 +506,7 b' appenlight.log_namespace_blacklist ='
 ################################################################################
 #set debug = false
 
-
-##############
-## STYLING  ##
-##############
+# enable debug style page
 debug_style = true
 
 ###########################################
@@ -514,6 +515,9 b' debug_style = true'
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+# pymysql is an alternative driver for MySQL, use in case of problems with default one
+#sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
+
 sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 
 # see sqlalchemy docs for other advanced settings
@@ -533,6 +537,9 b' sqlalchemy.db1.convert_unicode = true'
 ## which defaults to five.
 #sqlalchemy.db1.max_overflow = 10
 
+## Connection check ping, used to detect broken database connections
+## could be enabled to better handle cases if MySQL has gone away errors
+#sqlalchemy.db1.ping_connection = true
 
 ##################
 ### VCS CONFIG ###
@@ -547,15 +554,18 b' vcs.server.protocol = http'
 
 ## Push/Pull operations protocol, available options are:
 ## `http` - use http-rpc backend (default)
-##
 vcs.scm_app_implementation = http
 
 ## Push/Pull operations hooks protocol, available options are:
 ## `http` - use http-rpc backend (default)
 vcs.hooks.protocol = http
 
+## Host on which this instance is listening for hooks. If vcsserver is in other location
+## this should be adjusted.
+vcs.hooks.host = 127.0.0.1
+
 vcs.server.log_level = debug
-## Start VCSServer with this instance as a subprocess, usefull for development
+## Start VCSServer with this instance as a subprocess, useful for development
 vcs.start_server = false
 
 ## List of enabled VCS backends, available options are:
@@ -638,7 +648,7 b' custom.conf = 1'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
+keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
 
 [handlers]
 keys = console, console_sql
@@ -694,9 +704,12 b' level = DEBUG'
 formatter = color_formatter
 
 [handler_console_sql]
+# "level = DEBUG" logs SQL queries and results.
+# "level = INFO" logs SQL queries.
+# "level = WARN" logs neither.  (Recommended for production systems.)
 class = StreamHandler
 args = (sys.stderr, )
-level = DEBUG
+level = WARN
 formatter = color_formatter_sql
 
 ################
@@ -715,5 +728,5 b' datefmt = %Y-%m-%d %H:%M:%S'
 
 [formatter_color_formatter_sql]
 class = rhodecode.lib.logging_formatter.ColorFormatterSql
-format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S

configs/production.ini

@@ -2,7 +2,6 b''
 
 ################################################################################
 ##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
-# The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 
 [DEFAULT]
@@ -46,10 +45,9 b' debug = true'
 host = 127.0.0.1
 port = 5000
 
-##################################
-##     WAITRESS WSGI SERVER     ##
-## Recommended for Development  ##
-##################################
+###########################################################
+## WAITRESS WSGI SERVER - Recommended for Development  ####
+###########################################################
 
 #use = egg:waitress#main
 ## number of worker threads
@@ -67,21 +65,21 b' port = 5000'
 ## run with gunicorn --log-config rhodecode.ini --paste rhodecode.ini
 
 use = egg:gunicorn#main
-## Sets the number of process workers. You must set `instance_id = *`
-## when this option is set to more than one worker, recommended
-## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
-## The `instance_id = *` must be set in the [app:main] section below
+## Sets the number of process workers. More workers means more concurent connections
+## RhodeCode can handle at the same time. Each additional worker also it increases
+## memory usage as each has it's own set of caches.
+## Recommended value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers, but no more
+## than 8-10 unless for really big deployments .e.g 700-1000 users.
+## `instance_id = *` must be set in the [app:main] section below (which is the default)
+## when using more than 1 worker.
 workers = 2
-## number of threads for each of the worker, must be set to 1 for gevent
-## generally recommended to be at 1
-#threads = 1
-## process name
+## process name visible in process list
 proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
 worker_class = gevent
 ## The maximum number of simultaneous clients. Valid only for Gevent
-#worker_connections = 10
+worker_connections = 10
 ## max number of requests that worker will handle before being gracefully
 ## restarted, could prevent memory leaks
 max_requests = 1000
@@ -103,6 +101,11 b' use = egg:PasteDeploy#prefix'
 prefix = /
 
 [app:main]
+## The %(here)s variable will be replaced with the absolute path of parent directory
+## of this file
+## In addition ENVIRONMENT variables usage is possible, e.g
+## sqlalchemy.db1.url = {ENV_RC_DB_URL}
+
 use = egg:rhodecode-enterprise-ce
 
 ## enable proxy prefix middleware, defined above
@@ -123,12 +126,12 b' gzip_responses = false'
 ## autogenerate javascript routes file on startup
 generate_js_files = false
 
-## Optional Languages
-## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
+## System global default language.
+## All available languages: en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
 lang = en
 
-## perform a full repository scan on each server start, this should be
-## set to false after first startup, to allow faster server restarts.
+## Perform a full repository scan and import on each server start.
+## Settings this to true could lead to very long startup time.
 startup.import_repos = false
 
 ## Uncomment and set this path to use archive download cache.
@@ -142,23 +145,23 b' startup.import_repos = false'
 ## SSH calls. Set this for events to receive proper url for SSH calls.
 app.base_url = http://rhodecode.local
 
-## change this to unique ID for security
+## Unique application ID. Should be a random unique string for security.
 app_instance_uuid = rc-production
 
-## cut off limit for large diffs (size in bytes). If overall diff size on
+## Cut off limit for large diffs (size in bytes). If overall diff size on
 ## commit, or pull request exceeds this limit this diff will be displayed
 ## partially. E.g 512000 == 512Kb
 cut_off_limit_diff = 512000
 
-## cut off limit for large files inside diffs (size in bytes). Each individual
+## Cut off limit for large files inside diffs (size in bytes). Each individual
 ## file inside diff which exceeds this limit will be displayed partially.
 ##  E.g 128000 == 128Kb
 cut_off_limit_file = 128000
 
-## use cache version of scm repo everywhere
+## use cached version of vcs repositories everywhere. Recommended to be `true`
 vcs_full_cache = true
 
-## force https in RhodeCode, fixes https redirects, assumes it's always https
+## Force https in RhodeCode, fixes https redirects, assumes it's always https.
 ## Normally this is controlled by proper http flags sent from http server
 force_https = false
 
@@ -205,7 +208,7 b' gist_alias_url ='
 #    GistView:*
 api_access_controllers_whitelist =
 
-## default encoding used to convert from and to unicode
+## Default encoding used to convert from and to unicode
 ## can be also a comma separated list of encoding in case of mixed encodings
 default_encoding = UTF-8
 
@@ -252,8 +255,8 b' allow_repo_location_change = true'
 ## allows to setup custom hooks in settings page
 allow_custom_hooks_settings = true
 
-## generated license token, goto license page in RhodeCode settings to obtain
-## new token
+## Generated license token required for EE edition license.
+## New generated token value can be found in Admin > settings > license page.
 license_token =
 
 ## supervisor connection uri, for managing supervisor and logs.
@@ -283,65 +286,66 b' celery.max_tasks_per_child = 100'
 ## tasks will never be sent to the queue, but executed locally instead.
 celery.task_always_eager = false
 
-####################################
-###         BEAKER CACHE        ####
-####################################
-# default cache dir for templates.  Putting this into a ramdisk
-## can boost performance, eg. %(here)s/data_ramdisk
+#####################################
+###         DOGPILE CACHE        ####
+#####################################
+## Default cache dir for caches.  Putting this into a ramdisk
+## can boost performance, eg. /tmpfs/data_ramdisk, however this directory might require
+## large amount of space
 cache_dir = %(here)s/data
 
-## locking and default file storage for Beaker. Putting this into a ramdisk
-## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
-beaker.cache.data_dir = %(here)s/data/cache/beaker_data
-beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
-
-beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
+## `cache_perms` cache settings for permission tree, auth TTL.
+rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_perms.expiration_time = 300
 
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 10
-beaker.cache.super_short_term.key_length = 256
+## alternative `cache_perms` redis backend with distributed lock
+#rc_cache.cache_perms.backend = dogpile.cache.rc.redis
+#rc_cache.cache_perms.expiration_time = 300
+## redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_perms.arguments.redis_expiration_time = 7200
+#rc_cache.cache_perms.arguments.socket_timeout = 30
+#rc_cache.cache_perms.arguments.host = localhost
+#rc_cache.cache_perms.arguments.port = 6379
+#rc_cache.cache_perms.arguments.db = 0
+#rc_cache.cache_perms.arguments.distributed_lock = true
 
-beaker.cache.short_term.type = memory
-beaker.cache.short_term.expire = 60
-beaker.cache.short_term.key_length = 256
-
-beaker.cache.long_term.type = memory
-beaker.cache.long_term.expire = 36000
-beaker.cache.long_term.key_length = 256
+## `cache_repo` cache settings for FileTree, Readme, RSS FEEDS
+rc_cache.cache_repo.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_repo.expiration_time = 2592000
 
-beaker.cache.sql_cache_short.type = memory
-beaker.cache.sql_cache_short.expire = 10
-beaker.cache.sql_cache_short.key_length = 256
+## alternative `cache_repo` redis backend with distributed lock
+#rc_cache.cache_repo.backend = dogpile.cache.rc.redis
+#rc_cache.cache_repo.expiration_time = 2592000
+## redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_repo.arguments.redis_expiration_time = 2678400
+#rc_cache.cache_repo.arguments.socket_timeout = 30
+#rc_cache.cache_repo.arguments.host = localhost
+#rc_cache.cache_repo.arguments.port = 6379
+#rc_cache.cache_repo.arguments.db = 1
+#rc_cache.cache_repo.arguments.distributed_lock = true
 
-## default is memory cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.auth_plugins.type = ext:database
-#beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
-#beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
-#beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
-#beaker.cache.auth_plugins.sa.pool_recycle = 3600
-#beaker.cache.auth_plugins.sa.pool_size = 10
-#beaker.cache.auth_plugins.sa.max_overflow = 0
+## cache settings for SQL queries, this needs to use memory type backend
+rc_cache.sql_cache_short.backend = dogpile.cache.rc.memory_lru
+rc_cache.sql_cache_short.expiration_time = 30
 
-beaker.cache.repo_cache_long.type = memorylru_base
-beaker.cache.repo_cache_long.max_items = 4096
-beaker.cache.repo_cache_long.expire = 2592000
+## `cache_repo_longterm` cache for repo object instances, this needs to use memory
+## type backend as the objects kept are not pickle serializable
+rc_cache.cache_repo_longterm.backend = dogpile.cache.rc.memory_lru
+## by default we use 96H, this is using invalidation on push anyway
+rc_cache.cache_repo_longterm.expiration_time = 345600
+## max items in LRU cache, reduce this number to save memory, and expire last used
+## cached objects
+rc_cache.cache_repo_longterm.max_size = 10000
 
-## default is memorylru_base cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.repo_cache_long.type = ext:memcached
-#beaker.cache.repo_cache_long.url = localhost:11211
-#beaker.cache.repo_cache_long.expire = 1209600
-#beaker.cache.repo_cache_long.key_length = 256
 
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
-## types are file, ext:memcached, ext:database, and memory (default).
+## types are file, ext:memcached, ext:redis, ext:database, and memory (default).
 beaker.session.type = file
-beaker.session.data_dir = %(here)s/data/sessions/data
+beaker.session.data_dir = %(here)s/data/sessions
 
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
@@ -484,6 +488,9 b' set debug = false'
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+# pymysql is an alternative driver for MySQL, use in case of problems with default one
+#sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
+
 sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 
 # see sqlalchemy docs for other advanced settings
@@ -503,6 +510,9 b' sqlalchemy.db1.convert_unicode = true'
 ## which defaults to five.
 #sqlalchemy.db1.max_overflow = 10
 
+## Connection check ping, used to detect broken database connections
+## could be enabled to better handle cases if MySQL has gone away errors
+#sqlalchemy.db1.ping_connection = true
 
 ##################
 ### VCS CONFIG ###
@@ -517,15 +527,17 b' vcs.server.protocol = http'
 
 ## Push/Pull operations protocol, available options are:
 ## `http` - use http-rpc backend (default)
-##
 vcs.scm_app_implementation = http
 
 ## Push/Pull operations hooks protocol, available options are:
 ## `http` - use http-rpc backend (default)
 vcs.hooks.protocol = http
+## Host on which this instance is listening for hooks. If vcsserver is in other location
+## this should be adjusted.
+vcs.hooks.host = 127.0.0.1
 
 vcs.server.log_level = info
-## Start VCSServer with this instance as a subprocess, usefull for development
+## Start VCSServer with this instance as a subprocess, useful for development
 vcs.start_server = false
 
 ## List of enabled VCS backends, available options are:
@@ -608,7 +620,7 b' custom.conf = 1'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
+keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
 
 [handlers]
 keys = console, console_sql
@@ -664,6 +676,9 b' level = INFO'
 formatter = generic
 
 [handler_console_sql]
+# "level = DEBUG" logs SQL queries and results.
+# "level = INFO" logs SQL queries.
+# "level = WARN" logs neither.  (Recommended for production systems.)
 class = StreamHandler
 args = (sys.stderr, )
 level = WARN
@@ -685,5 +700,5 b' datefmt = %Y-%m-%d %H:%M:%S'
 
 [formatter_color_formatter_sql]
 class = rhodecode.lib.logging_formatter.ColorFormatterSql
-format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S

default.nix

@@ -1,41 +1,40 b''
 # Nix environment for the community edition
 #
-# This shall be as lean as possible, just producing the Enterprise
+# This shall be as lean as possible, just producing the enterprise-ce
 # derivation. For advanced tweaks to pimp up the development environment we use
 # "shell.nix" so that it does not have to clutter this file.
+#
+# Configuration, set values in "~/.nixpkgs/config.nix".
+# example
+#  {
+#    # Thoughts on how to configure the dev environment
+#    rc = {
+#      codeInternalUrl = "https://usr:[e-mail]";
+#      sources = {
+#        rhodecode-vcsserver = "/home/user/work/rhodecode-vcsserver";
+#        rhodecode-enterprise-ce = "/home/user/work/rhodecode-enterprise-ce";
+#        rhodecode-enterprise-ee = "/home/user/work/rhodecode-enterprise-ee";
+#      };
+#    };
+#  }
 
 args@
 { pythonPackages ? "python27Packages"
 , pythonExternalOverrides ? self: super: {}
-, doCheck ? true
+, doCheck ? false
 , ...
 }:
 
 let
-
   # Use nixpkgs from args or import them. We use this indirect approach
   # through args to be able to use the name `pkgs` for our customized packages.
   # Otherwise we will end up with an infinite recursion.
-  nixpkgs = args.pkgs or (import <nixpkgs> { });
+  pkgs = args.pkgs or (import <nixpkgs> { });
 
-  # johbo: Interim bridge which allows us to build with the upcoming
-  # nixos.16.09 branch (unstable at the moment of writing this note) and the
-  # current stable nixos-16.03.
-  backwardsCompatibleFetchgit = { ... }@args:
-    let
-      origSources = nixpkgs.fetchgit args;
-    in
-    nixpkgs.lib.overrideDerivation origSources (oldAttrs: {
-      NIX_PREFETCH_GIT_CHECKOUT_HOOK = ''
-        find $out -name '.git*' -print0 | xargs -0 rm -rf
-      '';
-    });
-
-  # Create a customized version of nixpkgs which should be used throughout the
-  # rest of this file.
-  pkgs = nixpkgs.overridePackages (self: super: {
-    fetchgit = backwardsCompatibleFetchgit;
-  });
+  # Works with the new python-packages, still can fallback to the old
+  # variant.
+  basePythonPackagesUnfix = basePythonPackages.__unfix__ or (
+    self: basePythonPackages.override (a: { inherit self; }));
 
   # Evaluates to the last segment of a file system path.
   basename = path: with pkgs.lib; last (splitString "/" path);
@@ -46,7 +45,7 b' let'
       ext = last (splitString "." path);
     in
       !builtins.elem (basename path) [
-        ".git" ".hg" "__pycache__" ".eggs"
+        ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev"
         "bower_components" "node_modules"
         "build" "data" "result" "tmp"] &&
       !builtins.elem ext ["egg-info" "pyc"] &&
@@ -54,18 +53,20 b' let'
       # it would still be good to restore it since we want to ignore "result-*".
       !hasPrefix "result" path;
 
-  basePythonPackages = with builtins; if isAttrs pythonPackages
-    then pythonPackages
-    else getAttr pythonPackages pkgs;
+  sources =
+    let
+      inherit (pkgs.lib) all isString attrValues;
+      sourcesConfig = pkgs.config.rc.sources or {};
+    in
+      # Ensure that sources are configured as strings. Using a path
+      # would result in a copy into the nix store.
+      assert all isString (attrValues sourcesConfig);
+      sourcesConfig;
 
-  buildBowerComponents =
-    pkgs.buildBowerComponents or
-    (import ./pkgs/backport-16.03-build-bower-components.nix { inherit pkgs; });
-
-  sources = pkgs.config.rc.sources or {};
-  version = builtins.readFile ./rhodecode/VERSION;
+  version = builtins.readFile "${rhodecode-enterprise-ce-src}/rhodecode/VERSION";
   rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.;
 
+  buildBowerComponents = pkgs.buildBowerComponents;
   nodeEnv = import ./pkgs/node-default.nix {
     inherit pkgs;
   };
@@ -77,133 +78,145 b' let'
     src = rhodecode-enterprise-ce-src;
   };
 
-  pythonGeneratedPackages = self: basePythonPackages.override (a: {
-    inherit self;
-  })
-  // (scopedImport {
-    self = self;
-    super = basePythonPackages;
-    inherit pkgs;
-    inherit (pkgs) fetchurl fetchgit;
-  } ./pkgs/python-packages.nix);
+  rhodecode-testdata-src = sources.rhodecode-testdata or (
+    pkgs.fetchhg {
+      url = "https://code.rhodecode.com/upstream/rc_testdata";
+      rev = "v0.10.0";
+      sha256 = "0zn9swwvx4vgw4qn8q3ri26vvzgrxn15x6xnjrysi1bwmz01qjl0";
+  });
 
-  pythonOverrides = import ./pkgs/python-packages-overrides.nix {
-    inherit
-      basePythonPackages
-      pkgs;
+  rhodecode-testdata = import "${rhodecode-testdata-src}/default.nix" {
+  inherit
+    doCheck
+    pkgs
+    pythonPackages;
   };
 
   pythonLocalOverrides = self: super: {
     rhodecode-enterprise-ce =
       let
         linkNodeAndBowerPackages = ''
-          echo "Export RhodeCode CE path"
           export RHODECODE_CE_PATH=${rhodecode-enterprise-ce-src}
-          echo "Link node packages"
+
+          echo "[BEGIN]: Link node packages"
           rm -fr node_modules
           mkdir node_modules
           # johbo: Linking individual packages allows us to run "npm install"
           # inside of a shell to try things out. Re-entering the shell will
           # restore a clean environment.
           ln -s ${nodeDependencies}/lib/node_modules/* node_modules/
+          echo "[DONE]: Link node packages"
 
-          echo "DONE: Link node packages"
-
-          echo "Link bower packages"
+          echo "[BEGIN]: Link bower packages"
           rm -fr bower_components
           mkdir bower_components
+          ln -s ${bowerComponents}/bower_components/* bower_components/
+          echo "[DONE]: Link bower packages"
+        '';
 
-          ln -s ${bowerComponents}/bower_components/* bower_components/
-          echo "DONE: Link bower packages"
-        '';
+        releaseName = "RhodeCodeEnterpriseCE-${version}";
       in super.rhodecode-enterprise-ce.override (attrs: {
-
       inherit
         doCheck
         version;
+
       name = "rhodecode-enterprise-ce-${version}";
-      releaseName = "RhodeCodeEnterpriseCE-${version}";
+      releaseName = releaseName;
       src = rhodecode-enterprise-ce-src;
       dontStrip = true; # prevent strip, we don't need it.
 
-      buildInputs =
-        attrs.buildInputs ++
-        (with self; [
-          pkgs.nodePackages.bower
-          pkgs.nodePackages.grunt-cli
-          pkgs.subversion
-          pytest-catchlog
-          rhodecode-testdata
-        ]);
-
-      #TODO: either move this into overrides, OR use the new machanics from
-      # pip2nix and requiremtn.txt file
-      propagatedBuildInputs = attrs.propagatedBuildInputs ++ (with self; [
-        rhodecode-tools
-      ]);
-
-      # TODO: johbo: Make a nicer way to expose the parts. Maybe
-      # pkgs/default.nix?
+      # expose following attributed outside
       passthru = {
         inherit
+          rhodecode-testdata
           bowerComponents
           linkNodeAndBowerPackages
           myPythonPackagesUnfix
-          pythonLocalOverrides;
+          pythonLocalOverrides
+          pythonCommunityOverrides;
+
         pythonPackages = self;
       };
 
+      buildInputs =
+        attrs.buildInputs or [] ++ [
+          rhodecode-testdata
+          pkgs.nodePackages.bower
+          pkgs.nodePackages.grunt-cli
+        ];
+
+      #NOTE: option to inject additional propagatedBuildInputs
+      propagatedBuildInputs =
+        attrs.propagatedBuildInputs or [] ++ [
+
+        ];
+
       LC_ALL = "en_US.UTF-8";
       LOCALE_ARCHIVE =
-        if pkgs.stdenv ? glibc
+        if pkgs.stdenv.isLinux
         then "${pkgs.glibcLocales}/lib/locale/locale-archive"
         else "";
 
+      # Add bin directory to path so that tests can find 'rhodecode'.
       preCheck = ''
         export PATH="$out/bin:$PATH"
       '';
 
+      # custom check phase for testing
+      checkPhase = ''
+        runHook preCheck
+        PYTHONHASHSEED=random py.test -vv -p no:sugar -r xw --cov-config=.coveragerc --cov=rhodecode --cov-report=term-missing rhodecode
+        runHook postCheck
+      '';
+
       postCheck = ''
-        rm -rf $out/lib/${self.python.libPrefix}/site-packages/pytest_pylons
+        echo "Cleanup of rhodecode/tests"
         rm -rf $out/lib/${self.python.libPrefix}/site-packages/rhodecode/tests
       '';
 
-      preBuild = linkNodeAndBowerPackages + ''
+      preBuild = ''
+
+        echo "Building frontend assets"
+        ${linkNodeAndBowerPackages}
         grunt
         rm -fr node_modules
       '';
 
       postInstall = ''
-        echo "Writing meta information for rccontrol to nix-support/rccontrol"
+        echo "Writing enterprise-ce meta information for rccontrol to nix-support/rccontrol"
         mkdir -p $out/nix-support/rccontrol
         cp -v rhodecode/VERSION $out/nix-support/rccontrol/version
-        echo "DONE: Meta information for rccontrol written"
+        echo "[DONE]: enterprise-ce meta information for rccontrol written"
+
+        mkdir -p $out/etc
+        cp configs/production.ini $out/etc
+        echo "[DONE]: saved enterprise-ce production.ini into $out/etc"
 
         # python based programs need to be wrapped
+        mkdir -p $out/bin
+        # rhodecode-tools
+        ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
+
+        # required binaries from dependencies
+        #ln -s ${self.python}/bin/python $out/bin
         ln -s ${self.pyramid}/bin/* $out/bin/
         ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
         ln -s ${self.supervisor}/bin/supervisor* $out/bin/
-        ln -s ${self.PasteScript}/bin/paster $out/bin/
+        ln -s ${self.pastescript}/bin/paster $out/bin/
         ln -s ${self.channelstream}/bin/channelstream $out/bin/
         ln -s ${self.celery}/bin/celery $out/bin/
+        echo "[DONE]: created symlinks into $out/bin"
 
-        # rhodecode-tools
-        ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
-
-        # note that condition should be restricted when adding further tools
         for file in $out/bin/*;
         do
           wrapProgram $file \
-              --prefix PATH : $PATH \
-              --prefix PYTHONPATH : $PYTHONPATH \
-              --set PYTHONHASHSEED random
+            --prefix PATH : $PATH \
+            --prefix PYTHONPATH : $PYTHONPATH \
+            --set PYTHONHASHSEED random
         done
 
-        mkdir $out/etc
-        cp configs/production.ini $out/etc
+        echo "[DONE]: enterprise-ce binary wrapping"
 
-
-        # TODO: johbo: Make part of ac-tests
         if [ ! -f rhodecode/public/js/scripts.js ]; then
           echo "Missing scripts.js"
           exit 1
@@ -213,31 +226,33 b' let'
           exit 1
         fi
       '';
-
     });
 
-    rhodecode-testdata = import "${rhodecode-testdata-src}/default.nix" {
-    inherit
-      doCheck
-      pkgs
-      pythonPackages;
-    };
-
   };
 
-  rhodecode-testdata-src = sources.rhodecode-testdata or (
-    pkgs.fetchhg {
-      url = "https://code.rhodecode.com/upstream/rc_testdata";
-      rev = "v0.10.0";
-      sha256 = "0zn9swwvx4vgw4qn8q3ri26vvzgrxn15x6xnjrysi1bwmz01qjl0";
-  });
+  basePythonPackages = with builtins;
+    if isAttrs pythonPackages then
+      pythonPackages
+    else
+      getAttr pythonPackages pkgs;
+
+  pythonGeneratedPackages = import ./pkgs/python-packages.nix {
+    inherit pkgs;
+    inherit (pkgs) fetchurl fetchgit fetchhg;
+  };
+
+  pythonCommunityOverrides = import ./pkgs/python-packages-overrides.nix {
+    inherit pkgs basePythonPackages;
+  };
 
   # Apply all overrides and fix the final package set
   myPythonPackagesUnfix = with pkgs.lib;
     (extends pythonExternalOverrides
     (extends pythonLocalOverrides
-    (extends pythonOverrides
-             pythonGeneratedPackages)));
+    (extends pythonCommunityOverrides
+    (extends pythonGeneratedPackages
+             basePythonPackagesUnfix))));
+
   myPythonPackages = (pkgs.lib.fix myPythonPackagesUnfix);
 
 in myPythonPackages.rhodecode-enterprise-ce

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/admin/indexing.rst

@@ -88,17 +88,21 b' want to index:'
    (venv)$ rhodecode-index --instance-name=enterprise-1
 
    # Using default installation
-   $ /home/user/.rccontrol/enterprise-4/profile/bin/rhodecode-index \
-       --instance-name=enterprise-4
+   $ /home/user/.rccontrol/enterprise-1/profile/bin/rhodecode-index \
+       --instance-name=enterprise-1
 
    # Using a custom mapping file
-   $ /home/user/.rccontrol/enterprise-4/profile/bin/rhodecode-index \
-       --instance-name=enterprise-4 \
-       --mapping=/home/user/.rccontrol/enterprise-4/mapping.ini
+   $ /home/user/.rccontrol/enterprise-1/profile/bin/rhodecode-index \
+       --instance-name=enterprise-1 \
+       --mapping=/home/user/.rccontrol/enterprise-1/mapping.ini
 
 .. note::
 
-   |RCT| require |PY| 2.7 to run.
+   In case of often indexing the index may become fragmented. Most often a result of that
+   is error about `too many open files`. To fix this indexer needs to be executed with
+   --optimize flag. E.g `rhodecode-index --instance-name=enterprise-1 --optimize`
+   This should be executed regularly, once a week is recommended.
+
 
 .. _set-index:
 

docs/admin/tuning-user-sessions-performance.rst

@@ -12,7 +12,7 b' if there are lots of session files.'
 
 Therefore, in a large scale deployment, to give better performance,
 scalability, and maintainability we recommend switching from file-based
-sessions to database-based user sessions or memcached sessions.
+sessions to database-based user sessions or Redis based sessions.
 
 To switch to database-based user sessions uncomment the following section in
 your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
@@ -41,14 +41,20 b' and make sure you comment out the file b'
       #beaker.session.data_dir = %(here)s/data/sessions/data
 
 
-To switch to memcached-based user sessions uncomment the following section in
+The `table_name` will be automatically created on specified database if it isn't yet existing.
+Database specified in the `beaker.session.sa.url` can be the same that RhodeCode
+uses, or if required it can be a different one. We recommend to use the same database.
+
+
+
+To switch to reds-based user sessions uncomment the following section in
 your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
 
 .. code-block:: ini
 
-      ## memcached sessions
-      beaker.session.type = ext:memcached
-      beaker.session.url = localhost:11211
+      ## redis sessions
+      beaker.session.type = ext:redis
+      beaker.session.url = localhost:6379
 
 
 and make sure you comment out the file based sessions.

docs/api/methods/pull-request-methods.rst

@@ -83,7 +83,7 b' comment_pull_request'
 create_pull_request 
 -------------------
 
-.. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, title, description=<Optional:''>, reviewers=<Optional:None>)
+.. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>)
 
    Creates a new pull request.
 
@@ -104,10 +104,14 b' create_pull_request'
    :type source_ref: str
    :param target_ref: Set the target ref name.
    :type target_ref: str
-   :param title: Set the pull request title.
+   :param title: Optionally Set the pull request title, it's generated otherwise
    :type title: str
    :param description: Set the pull request description.
    :type description: Optional(str)
+   :type description_renderer: Optional(str)
+   :param description_renderer: Set pull request renderer for the description.
+       It should be 'rst', 'markdown' or 'plain'. If not give default
+       system renderer will be used
    :param reviewers: Set the new pull request reviewers list.
        Reviewer defined by review rules will be added automatically to the
        defined list.
@@ -368,7 +372,7 b' merge_pull_request'
 update_pull_request 
 -------------------
 
-.. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
+.. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
 
    Updates a pull request.
 
@@ -382,6 +386,9 b' update_pull_request'
    :type title: str
    :param description: Update pull request description.
    :type description: Optional(str)
+   :type description_renderer: Optional(str)
+   :param description_renderer: Update pull request renderer for the description.
+       It should be 'rst', 'markdown' or 'plain'
    :param reviewers: Update pull request reviewers list with new value.
    :type reviewers: Optional(list)
        Accepts username strings or objects of the format:

docs/conf.py

@@ -32,6 +32,7 b' import common'
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.imgmath'
@@ -42,13 +43,6 b' intersphinx_mapping = {'
     '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']
 
@@ -65,11 +59,12 b" master_doc = 'index'"
 # |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.

docs/contributing/dev-setup.rst

@@ -47,7 +47,7 b' Switch nix to the latest STABLE channel'
 
 run::
 
-   nix-channel --add https://nixos.org/channels/nixos-16.03 nixpkgs
+   nix-channel --add https://nixos.org/channels/nixos-18.03 nixpkgs
 
 Followed by::
 

docs/default.nix

@@ -5,249 +5,215 b' 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://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://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
-      md5 = "6411537324b4dba0956aaa8109f3c77b";
+      url = "https://files.pythonhosted.org/packages/e1/0f/f8d5e939184547b3bdc6128551b831a62832713aa98c2ccdf8c47ecc7f17/certifi-2018.8.24.tar.gz";
+      sha256 = "0f0nhrj9mlrf79iway4578wrsgmjh0fmacl9zv8zjckdy7b90rip";
+    };
+  };
+  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";
     };
   };
-
-  MarkupSafe = buildPythonPackage rec {
-    name = "MarkupSafe-1.0";
-    buildInputs = [];
+  idna = 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 = buildPythonPackage {
+    name = "imagesize-1.1.0";
     doCheck = false;
-    propagatedBuildInputs = [];
     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";
     };
   };
-
-  Sphinx = buildPythonPackage (rec {
-    name = "Sphinx-1.6.5";
+  pyparsing = buildPythonPackage {
+    name = "pyparsing-2.2.0";
+    doCheck = false;
     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/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz";
+      sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
     };
+  };
+  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 = [
-        six
-        Jinja2
-        Pygments
-        docutils
-        snowballstemmer
-        babel
-        alabaster
-        imagesize
-        requests
-        setuptools
-        sphinxcontrib-websupport
-        typing
-
-        # special cases
-        pytz
-        sphinx_rtd_theme
-
+      chardet
+      idna
+      urllib3
+      certifi
     ];
-  });
-
-  alabaster = buildPythonPackage rec {
-    name = "alabaster-0.7.10";
-    buildInputs = [];
+    src = fetchurl {
+      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;
-    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/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";
     };
   };
-
-  babel = buildPythonPackage {
-    name = "babel-2.5.1";
-    buildInputs = [];
+  sphinx = buildPythonPackage {
+    name = "sphinx-1.7.8";
     doCheck = false;
-    propagatedBuildInputs = [pytz];
+    propagatedBuildInputs = [
+      six
+      jinja2
+      pygments
+      docutils
+      snowballstemmer
+      babel
+      alabaster
+      imagesize
+      requests
+      setuptools
+      packaging
+      sphinxcontrib-websupport
+      typing
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/5a/22/63f1dbb8514bb7e0d0c8a85cc9b14506599a075e231985f98afd70430e1f/Babel-2.5.1.tar.gz";
-      md5 = "60228b3ce93a203357158b909afe8ae1";
+      url = "https://files.pythonhosted.org/packages/ac/54/4ef326d0c654da1ed91341a7a1f43efc18a8c770ddd2b8e45df97cb79d82/Sphinx-1.7.8.tar.gz";
+      sha256 = "1ryz0w4c31930f1br2sjwrxwx9cmsy7cqdb0d81g98n9bj250w50";
     };
   };
-
-  certifi = buildPythonPackage {
-    name = "certifi-2017.11.5";
-    buildInputs = [];
+  sphinx-rtd-theme = buildPythonPackage {
+    name = "sphinx-rtd-theme-0.4.1";
     doCheck = false;
-    propagatedBuildInputs = [];
+    propagatedBuildInputs = [
+      sphinx
+    ];
     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";
+    };
+  };
+  urllib3 = 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";
     };
   };
 
-  idna = buildPythonPackage {
-    name = "idna-2.6";
-    buildInputs = [];
-    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";
-    };
-  };
-
-  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;
@@ -255,7 +221,7 b' let'
 in python.buildEnv.override {
   inherit python;
   extraLibs = [
-    Sphinx
-    sphinx_rtd_theme
+    sphinx
+    sphinx-rtd-theme
   ];
-}
+}
  No newline at end of file

docs/known-issues/known-issues.rst

@@ -37,6 +37,7 b' To convert the old version into a curren'
 |repo| into a local machine using a recent |git| client, then push it to a new
 |repo| inside |RCE|.
 
+
 VCS Server Memory Consumption
 -----------------------------
 
@@ -48,24 +49,34 b' shipped with the optimal configuration a'
 To fix this issue, upgrade to |RCE| 3.3.2 or greater, and if you discover
 memory consumption issues check the VCS Server settings.
 
-Fedora 23
----------
+Fedora 23 / Ubuntu 18.04
+------------------------
+
+|RCC| has a know problem with locales, due to changes in glibc 2.27+ which affects
+the local-archive format, which is now incompatible with our used glibc 2.26.
+
 
-|RCC| does not run perfectly on Fedora 23 due to a locale issue. This is a
-known issue under investigation due to the Nix packaging of the product, see the
-`Github issue here`_. |RCC| runs fine on Fedora 21.
+To work around this problem, you need set path to ``$LOCAL_ARCHIVE`` to the
+locale package in older pre glibc 2.27 format, or set `LC_ALL=C` in your enviroment.
+
+To use the pre 2.27 locale-archive fix follow these steps:
 
-To work around this problem, you need to point ``$LOCAL_ARCHIVE`` to the
-workaround locale package.
+1. Download the pre 2.27 locale-archive package
 
-1. Download this package:
-   http://lipa.ms.mff.cuni.cz/~cunav5am/nix/locale-archive
+.. code-block:: bash
+
+    wget https://dls.rhodecode.com/assets/locale-archive
+
 
 2. Point ``$LOCAL_ARCHIVE`` to the locale package.
 
 .. code-block:: bash
 
-    $ export LOCALE_ARCHIVE=/home/VERSION/locale-archive # change to your path
+    $ export LOCALE_ARCHIVE=/home/USER/locale-archive  # change to your path
+
+This can either added in `~/.rccontrol/supervisor/supervisord.ini`
+or in user .bashrc/.zshrc etc, or via a startup script that
+runs `rccontrol self-init`
 
 If you happen to be running |RCC| from systemd, use the following
 example to pass the correct locale information on boot.
@@ -85,4 +96,3 b' example to pass the correct locale infor'
     [Install]
     WantedBy=multi-user.target
 
-.. _Github issue here: https://github.com/NixOS/nix/issues/599

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.13.0.rst
    release-notes-4.12.4.rst
    release-notes-4.12.3.rst
    release-notes-4.12.2.rst

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

package.json

@@ -1,6 +1,13 b''
 {
   "name": "rhodecode-enterprise",
-  "version": "0.0.1",
+  "version": "1.0.0",
+  "private": true,
+  "description" : "RhodeCode JS packaged",
+  "license": "SEE LICENSE IN LICENSE.txt",
+  "repository" : {
+    "type" : "hg",
+    "url" : "https://code.rhodecode.com/rhodecode-enterprise-ce"
+  },
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-copy": "^1.0.0",
@@ -8,16 +15,17 b''
     "grunt-contrib-jshint": "^0.12.0",
     "grunt-contrib-less": "^1.1.0",
     "grunt-contrib-watch": "^0.6.1",
-    "crisper": "^2.0.2",
-    "vulcanize": "^1.14.8",
+    "crisper": "^2.1.1",
+    "vulcanize": "^1.16.0",
     "grunt-crisper": "^1.0.1",
     "grunt-vulcanize": "^1.0.0",
     "node2nix": "^1.0.0",
     "jshint": "^2.9.1-rc3",
-    "bower": "^1.7.9",
+    "bower": "^1.8.4",
     "jquery": "1.11.3",
     "favico.js": "^0.3.10",
-    "clipboard": "^1.7.1",
+    "clipboard": "^2.0.1",
+    "qrious": "^4.0.2",
     "moment": "^2.18.1",
     "mousetrap": "^1.6.1",
     "appenlight-client": "git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1"

pkgs/bower-packages.nix

@@ -1,33 +1,30 b''
+# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "webcomponentsjs" "0.7.22" "^0.7.22" "178h9j8jq9wi5845f5pxhhhqw6x022nzmpzm4di8fgsdl1f6nr5d")
-  (fetchbower "polymer" "Polymer/polymer#1.6.1" "Polymer/polymer#^1.6.1" "09mm0jgk457gvwqlc155swch7gjr6fs3g7spnvhi6vh5b6518540")
-  (fetchbower "paper-button" "PolymerElements/paper-button#1.0.13" "PolymerElements/paper-button#^1.0.13" "0i3y153nqk06pn0gk282vyybnl3g1w3w41d5i9z659cgn27g3fvm")
-  (fetchbower "paper-spinner" "PolymerElements/paper-spinner#1.2.0" "PolymerElements/paper-spinner#^1.2.0" "1av1m6y81jw3hjhz1yqy3rwcgxarjzl58ldfn4q6sn51pgzngfqb")
-  (fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#1.1.3" "PolymerElements/paper-tooltip#^1.1.2" "0vmrm1n8k9sk9nvqy03q177axy22pia6i3j1gxbk72j3pqiqvg6k")
-  (fetchbower "paper-toast" "PolymerElements/paper-toast#1.3.0" "PolymerElements/paper-toast#^1.3.0" "0x9rqxsks5455s8pk4aikpp99ijdn6kxr9gvhwh99nbcqdzcxq1m")
-  (fetchbower "paper-toggle-button" "PolymerElements/paper-toggle-button#1.2.0" "PolymerElements/paper-toggle-button#^1.2.0" "0mphcng3ngspbpg4jjn0mb91nvr4xc1phq3qswib15h6sfww1b2w")
-  (fetchbower "iron-ajax" "PolymerElements/iron-ajax#1.4.4" "PolymerElements/iron-ajax#^1.4.4" "0jpi7ik3zljw8yh2ccc85r26lcpzmkc2nl1kn6fqdx57zkzk9v5b")
-  (fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#1.0.13" "PolymerElements/iron-autogrow-textarea#^1.0.13" "0zwhpl97vii1s8k0lgain8i9dnw29b0mxc5ixdscx9las13n2lqq")
-  (fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#1.0.6" "PolymerElements/iron-a11y-keys#^1.0.6" "1xz3mgghfcxixq28sdb654iaxj4nyi1bzcwf77ydkms6fviqs9mv")
-  (fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#1.3.1" "PolymerElements/iron-flex-layout#^1.0.0" "0nswv3ih3bhflgcd2wjfmddqswzgqxb2xbq65jk9w3rkj26hplbl")
-  (fetchbower "paper-behaviors" "PolymerElements/paper-behaviors#1.0.12" "PolymerElements/paper-behaviors#^1.0.0" "012bqk97awgz55cn7rm9g7cckrdhkqhls3zvp8l6nd4rdwcrdzq8")
-  (fetchbower "paper-material" "PolymerElements/paper-material#1.0.6" "PolymerElements/paper-material#^1.0.0" "0rljmknfdbm5aabvx9pk77754zckj3l127c3mvnmwkpkkr353xnh")
-  (fetchbower "paper-styles" "PolymerElements/paper-styles#1.1.4" "PolymerElements/paper-styles#^1.0.0" "0j8vg74xrcxlni8i93dsab3y80f34kk30lv4yblqpkp9c3nrilf7")
-  (fetchbower "neon-animation" "PolymerElements/neon-animation#1.2.4" "PolymerElements/neon-animation#^1.0.0" "16mz9i2n5w0k5j8d6gha23cnbdgm5syz3fawyh89gdbq97bi2q5j")
-  (fetchbower "iron-a11y-announcer" "PolymerElements/iron-a11y-announcer#1.0.5" "PolymerElements/iron-a11y-announcer#^1.0.0" "0n7c7j1pwk3835s7s2jd9125wdcsqf216yi5gj07wn5s8h8p7m9d")
-  (fetchbower "iron-overlay-behavior" "PolymerElements/iron-overlay-behavior#1.8.6" "PolymerElements/iron-overlay-behavior#^1.0.9" "14brn9gz6qqskarg3fxk91xs7vg02vgcsz9a9743kidxr0l0413m")
-  (fetchbower "iron-fit-behavior" "PolymerElements/iron-fit-behavior#1.2.5" "PolymerElements/iron-fit-behavior#^1.1.0" "1msnlh8lp1xg6v4h6dkjwj9kzac5q5q208ayla3x9hi483ki6rlf")
-  (fetchbower "iron-checked-element-behavior" "PolymerElements/iron-checked-element-behavior#1.0.5" "PolymerElements/iron-checked-element-behavior#^1.0.0" "0l0yy4ah454s8bzfv076s8by7h67zy9ni6xb932qwyhx8br6c1m7")
-  (fetchbower "promise-polyfill" "polymerlabs/promise-polyfill#1.0.1" "polymerlabs/promise-polyfill#^1.0.0" "045bj2caav3famr5hhxgs1dx7n08r4s46mlzwb313vdy17is38xb")
-  (fetchbower "iron-behaviors" "PolymerElements/iron-behaviors#1.0.17" "PolymerElements/iron-behaviors#^1.0.0" "021qvkmbk32jrrmmphpmwgby4bzi5jyf47rh1bxmq2ip07ly4bpr")
-  (fetchbower "iron-validatable-behavior" "PolymerElements/iron-validatable-behavior#1.1.1" "PolymerElements/iron-validatable-behavior#^1.0.0" "1yhxlvywhw2klbbgm3f3cmanxfxggagph4ii635zv0c13707wslv")
-  (fetchbower "iron-form-element-behavior" "PolymerElements/iron-form-element-behavior#1.0.6" "PolymerElements/iron-form-element-behavior#^1.0.0" "0rdhxivgkdhhz2yadgdbjfc70l555p3y83vjh8rfj5hr0asyn6q1")
-  (fetchbower "iron-a11y-keys-behavior" "polymerelements/iron-a11y-keys-behavior#1.1.9" "polymerelements/iron-a11y-keys-behavior#^1.0.0" "1imm4gc84qizihhbyhfa8lwjh3myhj837f79i5m04xjgwrjmkaf6")
-  (fetchbower "paper-ripple" "PolymerElements/paper-ripple#1.0.8" "PolymerElements/paper-ripple#^1.0.0" "0r9sq8ik7wwrw0qb82c3rw0c030ljwd3s466c9y4qbcrsbvfjnns")
-  (fetchbower "font-roboto" "PolymerElements/font-roboto#1.0.1" "PolymerElements/font-roboto#^1.0.1" "02jz43r0wkyr3yp7rq2rc08l5cwnsgca9fr54sr4rhsnl7cjpxrj")
-  (fetchbower "iron-meta" "PolymerElements/iron-meta#1.1.2" "PolymerElements/iron-meta#^1.0.0" "1wl4dx8fnsknw9z9xi8bpc4cy9x70c11x4zxwxnj73hf3smifppl")
-  (fetchbower "iron-resizable-behavior" "PolymerElements/iron-resizable-behavior#1.0.5" "PolymerElements/iron-resizable-behavior#^1.0.0" "1fd5zmbr2hax42vmcasncvk7lzi38fmb1kyii26nn8pnnjak7zkn")
-  (fetchbower "iron-selector" "PolymerElements/iron-selector#1.5.2" "PolymerElements/iron-selector#^1.0.0" "1ajv46llqzvahm5g6g75w7nfyjcslp53ji0wm96l2k94j87spv3r")
-  (fetchbower "web-animations-js" "web-animations/web-animations-js#2.2.2" "web-animations/web-animations-js#^2.2.0" "1izfvm3l67vwys0bqbhidi9rqziw2f8wv289386sc6jsxzgkzhga")
+  (fetchbower "webcomponentsjs" "1.2.3" "^1.2.3" "0db2fjk779rhl9d4ifpk1j9a83vngx6j3hk7si1752dqxj857267")
+  (fetchbower "polymer" "Polymer/polymer#2.6.0" "Polymer/polymer#^2.6.0" "1jw5syjn0naa7dlxzxvsgwb20zbkbpx0pcg0wzjq4wr49c20nw0k")
+  (fetchbower "paper-button" "PolymerElements/paper-button#2.1.2" "PolymerElements/paper-button#^2.1.2" "1lwmjwhvimh02gss39yjp5h7yg9mxl1ig59yrk085v86y5f5ilz1")
+  (fetchbower "paper-spinner" "PolymerElements/paper-spinner#2.1.0" "PolymerElements/paper-spinner#^2.1.0" "07jamgxzvy4r9pgf5ikj1fm8nkrw6sywgcxvmm7ax58hjvmd4i45")
+  (fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#2.1.1" "PolymerElements/paper-tooltip#^2.1.1" "0ja9vz4xps7dxfx6kmrwq0gifbjsyc3pk9l3hd5233ss72ghlvgb")
+  (fetchbower "paper-toast" "PolymerElements/paper-toast#2.1.2" "PolymerElements/paper-toast#^2.1.2" "0mkj9ayjx2l9hvrz4kw3yjbgrs9w873k05ywv94nh92mzpjkxn04")
+  (fetchbower "paper-toggle-button" "PolymerElements/paper-toggle-button#2.1.1" "PolymerElements/paper-toggle-button#^2.1.1" "1rl5ar3ny6r3v9hr8s68v8b3zh5yl52pikhi4b9iv9grv29g5999")
+  (fetchbower "iron-ajax" "PolymerElements/iron-ajax#2.1.3" "PolymerElements/iron-ajax#^2.1.3" "187zb6lkv18yapl292qhn611mbl4i2bqs2dimlwmdjaln285nc1l")
+  (fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#2.2.0" "PolymerElements/iron-autogrow-textarea#^2.2.0" "1cx7g49m20z08x25z24g2pvv6m6dwfbkga3nsw0rpi3jk7xhznqw")
+  (fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#2.1.2" "PolymerElements/iron-a11y-keys#^2.1.2" "0zdn3bzfrk88iwahmmzvcjn3m90zga1l8dx42b365n8if0n0zapj")
+  (fetchbower "shadycss" "webcomponents/shadycss#1.3.5" "webcomponents/shadycss#^v1.1.0" "1xp07d6jlmc3ywg4cdp2nijwi0vrbzw468242xz0s6zx5z2n2wzf")
+  (fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#2.0.3" "PolymerElements/iron-flex-layout#1 - 2" "1ir9ili3rkcgbfj6is5s70vyb7m6avz0av0lpjjlhhsplrrl90bk")
+  (fetchbower "paper-behaviors" "PolymerElements/paper-behaviors#2.1.1" "PolymerElements/paper-behaviors#1 - 2" "0wzyznmy1q64jsm6lck0xma92lg2hz9h9m05r68iy20iyrvbjld7")
+  (fetchbower "paper-styles" "PolymerElements/paper-styles#2.1.0" "PolymerElements/paper-styles#1 - 2" "0xzsd7pvjsk7lgcmvx4q0dvps40q3mymkx26zgs8ns91s1ssfqbx")
+  (fetchbower "iron-a11y-announcer" "PolymerElements/iron-a11y-announcer#2.1.0" "PolymerElements/iron-a11y-announcer#1 - 2" "1hvmw76im8y3pxmg1yfnlkzap429q9i4v1z42y7m8lz0996jmxrz")
+  (fetchbower "iron-overlay-behavior" "PolymerElements/iron-overlay-behavior#2.3.4" "PolymerElements/iron-overlay-behavior#1 - 2" "0hk2fxhfz7kg27349qz1c87vq6nfdcnjr9az3q95ak3rigsb71wg")
+  (fetchbower "iron-fit-behavior" "PolymerElements/iron-fit-behavior#2.2.1" "PolymerElements/iron-fit-behavior#1 - 2" "0v89am4r2fncr7m9k0f2xqh5bvgn2dqjjc7p515ix4grk89whbs3")
+  (fetchbower "iron-checked-element-behavior" "PolymerElements/iron-checked-element-behavior#2.1.1" "PolymerElements/iron-checked-element-behavior#1 - 2" "00gpvnb7anspadw59av7lca6p03qlx59dgnhw3lqf5v223dsh0l3")
+  (fetchbower "iron-behaviors" "PolymerElements/iron-behaviors#2.1.1" "PolymerElements/iron-behaviors#1 - 2" "0c71l1il76jg8gvyh8bwlqraif53gfnz5700vpg35qyr1biwbr1w")
+  (fetchbower "iron-validatable-behavior" "PolymerElements/iron-validatable-behavior#2.1.0" "PolymerElements/iron-validatable-behavior#1 - 2" "1j65zv7hcxdcyyanzhp2wap3bnx7cz8ghd44m12fad2206jj6ysi")
+  (fetchbower "iron-a11y-keys-behavior" "PolymerElements/iron-a11y-keys-behavior#2.1.1" "PolymerElements/iron-a11y-keys-behavior#1 - 2" "0jsw7wvh4wzcjqdbvxyha99h1ph61lykyyyvdb6hm8m8w40bhs9b")
+  (fetchbower "paper-ripple" "PolymerElements/paper-ripple#2.1.1" "PolymerElements/paper-ripple#1 - 2" "0sam6w83nxf9mss79j6hjfsx0288pf4hwr1bw5xclzgpddcjmrm5")
+  (fetchbower "font-roboto" "PolymerElements/font-roboto#1.1.0" "PolymerElements/font-roboto#^1.0.1" "0z4msvaa5pnr84j2r957g313fmdbdbrknhdw1axy5g48845yv04s")
+  (fetchbower "iron-resizable-behavior" "PolymerElements/iron-resizable-behavior#2.1.1" "PolymerElements/iron-resizable-behavior#1 - 2" "0169rg6kby0ypfiwbkin46ywaszwj7r91yn081yqd96l1115aqnk")
+  (fetchbower "iron-form-element-behavior" "PolymerElements/iron-form-element-behavior#2.1.3" "PolymerElements/iron-form-element-behavior#1 - 2" "1c83kkfqvb5pdlvrhad3l7b11i244a8lykc8kzfnb9ya0xrln0cn")
+  (fetchbower "iron-meta" "PolymerElements/iron-meta#2.1.1" "PolymerElements/iron-meta#1 - 2" "12w1pcl3w97xpxihqddbf2d9dx8xz5i1jd9bz1xrmfsh25isni40")
 ]; }

pkgs/node-default.nix

@@ -1,12 +1,14 b''
-# This file has been generated by node2nix 1.0.0. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python utillinux runCommand writeTextFile nodejs;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {

pkgs/node-env.nix

@@ -1,31 +1,33 b''
 # This file originates from node2nix
 
-{stdenv, python, nodejs, utillinux, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
 
 let
+  python = if nodejs ? python then nodejs.python else python2;
+
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
   tarWrapper = runCommand "tarWrapper" {} ''
     mkdir -p $out/bin
-    
+
     cat > $out/bin/tar <<EOF
     #! ${stdenv.shell} -e
     $(type -p tar) "\$@" --warning=no-unknown-keyword
     EOF
-    
+
     chmod +x $out/bin/tar
   '';
-  
+
   # Function that generates a TGZ file from a NPM project
   buildNodeSourceDist =
     { name, version, src, ... }:
-    
+
     stdenv.mkDerivation {
       name = "node-tarball-${name}-${version}";
       inherit src;
       buildInputs = [ nodejs ];
       buildPhase = ''
         export HOME=$TMPDIR
-        tgzFile=$(npm pack)
+        tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
       '';
       installPhase = ''
         mkdir -p $out/tarballs
@@ -42,151 +44,322 b' let'
           # Bundle the dependencies of the package
           mkdir -p node_modules
           cd node_modules
-          
+
           # Only include dependencies if they don't exist. They may also be bundled in the package.
           if [ ! -e "${dependency.name}" ]
           then
               ${composePackage dependency}
           fi
-          
+
           cd ..
         ''
       ) dependencies);
 
   # Recursively composes the dependencies of a package
   composePackage = { name, packageName, src, dependencies ? [], ... }@args:
-    let
-      fixImpureDependencies = writeTextFile {
-        name = "fixDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var url = require('url');
-          
-          /*
-           * Replaces an impure version specification by *
-           */
-          function replaceImpureVersionSpec(versionSpec) {
-              var parsedUrl = url.parse(versionSpec);
-              
-              if(versionSpec == "latest" || versionSpec == "unstable" ||
-                  versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
-                  return '*';
-              else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" ||
-                  parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:")
-                  return '*';
-              else
-                  return versionSpec;
-          }
-      
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-      
-          /* Replace dependencies */
-          if(packageObj.dependencies !== undefined) {
-              for(var dependency in packageObj.dependencies) {
-                  var versionSpec = packageObj.dependencies[dependency];
-                  packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-          
-          /* Replace development dependencies */
-          if(packageObj.devDependencies !== undefined) {
-              for(var dependency in packageObj.devDependencies) {
-                  var versionSpec = packageObj.devDependencies[dependency];
-                  packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-          
-          /* Replace optional dependencies */
-          if(packageObj.optionalDependencies !== undefined) {
-              for(var dependency in packageObj.optionalDependencies) {
-                  var versionSpec = packageObj.optionalDependencies[dependency];
-                  packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-          
-          /* Write the fixed JSON file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj));
-        '';
-      };
-    in
     ''
       DIR=$(pwd)
       cd $TMPDIR
-      
+
       unpackFile ${src}
-      
+
       # Make the base dir in which the target dependency resides first
       mkdir -p "$(dirname "$DIR/${packageName}")"
 
       if [ -f "${src}" ]
       then
           # Figure out what directory has been unpacked
-          packageDir=$(find . -type d -maxdepth 1 | tail -1)
-          
+          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
+
           # Restore write permissions to make building work
+          find "$packageDir" -type d -print0 | xargs -0 chmod u+x
           chmod -R u+w "$packageDir"
-          
+
           # Move the extracted tarball into the output folder
           mv "$packageDir" "$DIR/${packageName}"
       elif [ -d "${src}" ]
       then
+          # Get a stripped name (without hash) of the source directory.
+          # On old nixpkgs it's already set internally.
+          if [ -z "$strippedName" ]
+          then
+              strippedName="$(stripHash ${src})"
+          fi
+
           # Restore write permissions to make building work
-           chmod -R u+w $strippedName
-           
-           # Move the extracted directory into the output folder
-           mv $strippedName "$DIR/${packageName}"
+          chmod -R u+w "$strippedName"
+
+          # Move the extracted directory into the output folder
+          mv "$strippedName" "$DIR/${packageName}"
       fi
-      
+
       # Unset the stripped name to not confuse the next unpack step
       unset strippedName
-      
-      # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
-      # The following JavaScript replaces these by * to prevent that
+
+      # Include the dependencies of the package
       cd "$DIR/${packageName}"
-      node ${fixImpureDependencies}
-      
-      # Include the dependencies of the package
       ${includeDependencies { inherit dependencies; }}
       cd ..
       ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
+  pinpointDependencies = {dependencies, production}:
+    let
+      pinpointDependenciesFromPackageJSON = writeTextFile {
+        name = "pinpointDependencies.js";
+        text = ''
+          var fs = require('fs');
+          var path = require('path');
+
+          function resolveDependencyVersion(location, name) {
+              if(location == process.env['NIX_STORE']) {
+                  return null;
+              } else {
+                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+
+                  if(fs.existsSync(dependencyPackageJSON)) {
+                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+
+                      if(dependencyPackageObj.name == name) {
+                          return dependencyPackageObj.version;
+                      }
+                  } else {
+                      return resolveDependencyVersion(path.resolve(location, ".."), name);
+                  }
+              }
+          }
+
+          function replaceDependencies(dependencies) {
+              if(typeof dependencies == "object" && dependencies !== null) {
+                  for(var dependency in dependencies) {
+                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+
+                      if(resolvedVersion === null) {
+                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+                      } else {
+                          dependencies[dependency] = resolvedVersion;
+                      }
+                  }
+              }
+          }
+
+          /* Read the package.json configuration */
+          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+          /* Pinpoint all dependencies */
+          replaceDependencies(packageObj.dependencies);
+          if(process.argv[2] == "development") {
+              replaceDependencies(packageObj.devDependencies);
+          }
+          replaceDependencies(packageObj.optionalDependencies);
+
+          /* Write the fixed package.json file */
+          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+        '';
+      };
+    in
+    ''
+      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+
+      ${stdenv.lib.optionalString (dependencies != [])
+        ''
+          if [ -d node_modules ]
+          then
+              cd node_modules
+              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              cd ..
+          fi
+        ''}
+    '';
+
+  # Recursively traverses all dependencies of a package and pinpoints all
+  # dependencies in the package.json file to the versions that are actually
+  # being used.
+
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+    ''
+      if [ -d "${packageName}" ]
+      then
+          cd "${packageName}"
+          ${pinpointDependencies { inherit dependencies production; }}
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      fi
+    '';
+
   # Extract the Node.js source code which is used to compile packages with
   # native bindings
   nodeSources = runCommand "node-sources" {} ''
     tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
     mv node-* $out
   '';
-  
+
+  # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
+  addIntegrityFieldsScript = writeTextFile {
+    name = "addintegrityfields.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      function augmentDependencies(baseDir, dependencies) {
+          for(var dependencyName in dependencies) {
+              var dependency = dependencies[dependencyName];
+
+              // Open package.json and augment metadata fields
+              var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
+              var packageJSONPath = path.join(packageJSONDir, "package.json");
+
+              if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
+                  console.log("Adding metadata fields to: "+packageJSONPath);
+                  var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
+
+                  if(dependency.integrity) {
+                      packageObj["_integrity"] = dependency.integrity;
+                  } else {
+                      packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
+                  }
+
+                  packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+                  fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
+              }
+
+              // Augment transitive dependencies
+              if(dependency.dependencies !== undefined) {
+                  augmentDependencies(packageJSONDir, dependency.dependencies);
+              }
+          }
+      }
+
+      if(fs.existsSync("./package-lock.json")) {
+          var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
+
+          if(packageLock.lockfileVersion !== 1) {
+             process.stderr.write("Sorry, I only understand lock file version 1!\n");
+             process.exit(1);
+          }
+
+          if(packageLock.dependencies !== undefined) {
+              augmentDependencies(".", packageLock.dependencies);
+          }
+      }
+    '';
+  };
+
+  # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
+  reconstructPackageLock = writeTextFile {
+    name = "addintegrityfields.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+      var lockObj = {
+          name: packageObj.name,
+          version: packageObj.version,
+          lockfileVersion: 1,
+          requires: true,
+          dependencies: {}
+      };
+
+      function augmentPackageJSON(filePath, dependencies) {
+          var packageJSON = path.join(filePath, "package.json");
+          if(fs.existsSync(packageJSON)) {
+              var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+              dependencies[packageObj.name] = {
+                  version: packageObj.version,
+                  integrity: "sha1-000000000000000000000000000=",
+                  dependencies: {}
+              };
+              processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+          }
+      }
+
+      function processDependencies(dir, dependencies) {
+          if(fs.existsSync(dir)) {
+              var files = fs.readdirSync(dir);
+
+              files.forEach(function(entry) {
+                  var filePath = path.join(dir, entry);
+                  var stats = fs.statSync(filePath);
+
+                  if(stats.isDirectory()) {
+                      if(entry.substr(0, 1) == "@") {
+                          // When we encounter a namespace folder, augment all packages belonging to the scope
+                          var pkgFiles = fs.readdirSync(filePath);
+
+                          pkgFiles.forEach(function(entry) {
+                              if(stats.isDirectory()) {
+                                  var pkgFilePath = path.join(filePath, entry);
+                                  augmentPackageJSON(pkgFilePath, dependencies);
+                              }
+                          });
+                      } else {
+                          augmentPackageJSON(filePath, dependencies);
+                      }
+                  }
+              });
+          }
+      }
+
+      processDependencies("node_modules", lockObj.dependencies);
+
+      fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
+    '';
+  };
+
   # Builds and composes an NPM package including all its dependencies
-  buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args:
-    
-    stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
+  buildNodePackage =
+    { name
+    , packageName
+    , version
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , preRebuild ? ""
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
+    let
+      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+    in
+    stdenv.mkDerivation ({
       name = "node-${name}-${version}";
-      buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
-      dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments
-      
-      inherit dontNpmInstall preRebuild;
-      
-      unpackPhase = args.unpackPhase or "true";
-      
-      buildPhase = args.buildPhase or "true";
-      
+      buildInputs = [ tarWrapper python nodejs ]
+        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+        ++ buildInputs;
+
+      inherit dontStrip; # Stripping may fail a build for some package deployments
+      inherit dontNpmInstall preRebuild unpackPhase buildPhase;
+
       compositionScript = composePackage args;
-      passAsFile = [ "compositionScript" ];
-      
-      installPhase = args.installPhase or ''
+      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+
+      installPhase = ''
         # Create and enter a root node_modules/ folder
         mkdir -p $out/lib/node_modules
         cd $out/lib/node_modules
-          
+
         # Compose the package and all its dependencies
         source $compositionScriptPath
-        
+
+        # Pinpoint the versions of all dependencies to the ones that are actually being used
+        echo "pinpointing versions of dependencies..."
+        source $pinpointDependenciesScriptPath
+
         # Patch the shebangs of the bundled modules to prevent them from
         # calling executables outside the Nix store as much as possible
         patchShebangs .
-        
+
         # Deploy the Node.js package by running npm install. Since the
         # dependencies have been provided already by ourselves, it should not
         # attempt to install them again, which is good, because we want to make
@@ -196,23 +369,37 b' let'
         #
         # The other responsibilities of NPM are kept -- version checks, build
         # steps, postprocessing etc.
-        
+
         export HOME=$TMPDIR
         cd "${packageName}"
         runHook preRebuild
-        npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-        
+
+        ${stdenv.lib.optionalString bypassCache ''
+          if [ ! -f package-lock.json ]
+          then
+              echo "No package-lock.json file found, reconstructing..."
+              node ${reconstructPackageLock}
+          fi
+
+          node ${addIntegrityFieldsScript}
+        ''}
+
+        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
         if [ "$dontNpmInstall" != "1" ]
         then
-            npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
         fi
-        
+
         # Create symlink to the deployed executable folder, if applicable
         if [ -d "$out/lib/node_modules/.bin" ]
         then
             ln -s $out/lib/node_modules/.bin $out/bin
         fi
-        
+
         # Create symlinks to the deployed manual page folders, if applicable
         if [ -d "$out/lib/node_modules/${packageName}/man" ]
         then
@@ -226,52 +413,111 b' let'
                 done
             done
         fi
+
+        # Run post install hook, if provided
+        runHook postInstall
       '';
-    });
+    } // extraArgs);
 
   # Builds a development shell
-  buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, ... }@args:
+  buildNodeShell =
+    { name
+    , packageName
+    , version
+    , src
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
     let
-      nodeDependencies = stdenv.mkDerivation {
+      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+
+      nodeDependencies = stdenv.mkDerivation ({
         name = "node-dependencies-${name}-${version}";
-        
-        buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
-        
+
+        buildInputs = [ tarWrapper python nodejs ]
+          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
+
+        inherit dontStrip; # Stripping may fail a build for some package deployments
+        inherit dontNpmInstall unpackPhase buildPhase;
+
         includeScript = includeDependencies { inherit dependencies; };
-        passAsFile = [ "includeScript" ];
-        
-        buildCommand = ''
-          mkdir -p $out/lib
-          cd $out/lib
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+
+        installPhase = ''
+          mkdir -p $out/${packageName}
+          cd $out/${packageName}
+
           source $includeScriptPath
-          
+
           # Create fake package.json to make the npm commands work properly
-          cat > package.json <<EOF
-          {
-              "name": "${packageName}",
-              "version": "${version}"
-          }
-          EOF
-          
+          cp ${src}/package.json .
+          chmod 644 package.json
+          ${stdenv.lib.optionalString bypassCache ''
+            if [ -f ${src}/package-lock.json ]
+            then
+                cp ${src}/package-lock.json .
+            fi
+          ''}
+
+          # Pinpoint the versions of all dependencies to the ones that are actually being used
+          echo "pinpointing versions of dependencies..."
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          source $pinpointDependenciesScriptPath
+          cd ${packageName}
+
           # Patch the shebangs of the bundled modules to prevent them from
           # calling executables outside the Nix store as much as possible
           patchShebangs .
-          
-          export HOME=$TMPDIR
-          npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-          
-          ${stdenv.lib.optionalString (!dontNpmInstall) ''
-            npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+
+          export HOME=$PWD
+
+          ${stdenv.lib.optionalString bypassCache ''
+            if [ ! -f package-lock.json ]
+            then
+                echo "No package-lock.json file found, reconstructing..."
+                node ${reconstructPackageLock}
+            fi
+
+            node ${addIntegrityFieldsScript}
           ''}
 
+          npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
+          ${stdenv.lib.optionalString (!dontNpmInstall) ''
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+          ''}
+
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          mv ${packageName} lib
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
-      };
+      } // extraArgs);
     in
-    stdenv.lib.makeOverridable stdenv.mkDerivation {
+    stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
-      
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
+
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -281,7 +527,7 b' let'
         EOF
         chmod +x $out/bin/shell
       '';
-      
+
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
       shellHook = stdenv.lib.optionalString (dependencies != []) ''
@@ -289,4 +535,8 b' let'
       '';
     };
 in
-{ inherit buildNodeSourceDist buildNodePackage buildNodeShell; }
+{
+  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
+  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
+}

pkgs/node-packages.nix

@@ -1,9 +1,1207 b''
-# This file has been generated by node2nix 1.0.0. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
+    "@types/clone-0.1.30" = {
+      name = "_at_types_slash_clone";
+      packageName = "@types/clone";
+      version = "0.1.30";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz";
+        sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
+      };
+    };
+    "@types/node-4.2.23" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "4.2.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-4.2.23.tgz";
+        sha512 = "U6IchCNLRyswc9p6G6lxWlbE+KwAhZp6mGo6MD2yWpmFomhYmetK+c98OpKyvphNn04CU3aXeJrXdOqbXVTS/w==";
+      };
+    };
+    "@types/node-6.0.114" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "6.0.114";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-6.0.114.tgz";
+        sha512 = "5ViC9dwf1VIAtrOFTvOuN04lJgw28eKjuy0Vg2Bd/fSlxKP2feCSkIw04ZgOENL2ywdWrtbkthp1XVLEjJmouw==";
+      };
+    };
+    "@types/parse5-0.0.31" = {
+      name = "_at_types_slash_parse5";
+      packageName = "@types/parse5";
+      version = "0.0.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/parse5/-/parse5-0.0.31.tgz";
+        sha1 = "e827a493a443b156e1b582a2e4c3bdc0040f2ee7";
+      };
+    };
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
+    "acorn-3.3.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    };
+    "acorn-5.7.1" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz";
+        sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==";
+      };
+    };
+    "acorn-jsx-3.0.1" = {
+      name = "acorn-jsx";
+      packageName = "acorn-jsx";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
+        sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
+      };
+    };
+    "ajv-4.11.8" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
+        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
+      };
+    };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
+    "ansi-escape-sequences-3.0.0" = {
+      name = "ansi-escape-sequences";
+      packageName = "ansi-escape-sequences";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz";
+        sha1 = "1c18394b6af9b76ff9a63509fa497669fd2ce53e";
+      };
+    };
+    "ansi-regex-0.2.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
+        sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    };
+    "ansi-styles-1.1.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
+        sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
+      };
+    };
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    };
+    "appenlight-client-git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1" = {
+      name = "appenlight-client";
+      packageName = "appenlight-client";
+      version = "0.5.1";
+      src = fetchgit {
+        url = "https://[e-mail]/AppEnlight/appenlight-client-js.git";
+        rev = "14712c64c230fbbe94fcbc8094aef5eb3b90b307";
+        sha256 = "05146f5b932f166c9a4db601bc9c13ae686899653d1dd03121652631f9bc83d6";
+      };
+    };
+    "aproba-1.2.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+      };
+    };
+    "are-we-there-yet-1.1.5" = {
+      name = "are-we-there-yet";
+      packageName = "are-we-there-yet";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+      };
+    };
+    "argparse-0.1.16" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "0.1.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
+        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
+      };
+    };
+    "array-back-1.0.4" = {
+      name = "array-back";
+      packageName = "array-back";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz";
+        sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b";
+      };
+    };
+    "asap-2.0.6" = {
+      name = "asap";
+      packageName = "asap";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+      };
+    };
+    "asn1-0.2.3" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+      };
+    };
+    "assert-plus-0.2.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
+    "async-0.1.22" = {
+      name = "async";
+      packageName = "async";
+      version = "0.1.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
+        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+      };
+    };
+    "async-0.2.10" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      };
+    };
+    "async-1.0.0" = {
+      name = "async";
+      packageName = "async";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz";
+        sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
+      };
+    };
+    "async-2.6.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
+        sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
+      };
+    };
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    };
+    "aws-sign2-0.6.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+      };
+    };
+    "aws4-1.7.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
+        sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
+      };
+    };
+    "babel-polyfill-6.26.0" = {
+      name = "babel-polyfill";
+      packageName = "babel-polyfill";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz";
+        sha1 = "379937abc67d7895970adc621f284cd966cf2153";
+      };
+    };
+    "babel-runtime-6.26.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
+        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "base64-js-1.2.3" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz";
+        sha512 = "MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==";
+      };
+    };
+    "bcrypt-pbkdf-1.0.2" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    };
+    "boom-2.10.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+      };
+    };
+    "bower-1.8.4" = {
+      name = "bower";
+      packageName = "bower";
+      version = "1.8.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
+        sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "buffer-from-1.1.1" = {
+      name = "buffer-from";
+      packageName = "buffer-from";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
+        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+      };
+    };
+    "builtin-modules-1.1.1" = {
+      name = "builtin-modules";
+      packageName = "builtin-modules";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
+        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
+      };
+    };
+    "builtins-1.0.3" = {
+      name = "builtins";
+      packageName = "builtins";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz";
+        sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
+      };
+    };
+    "caseless-0.12.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    };
+    "chalk-0.5.1" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
+        sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
+      };
+    };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    };
+    "cli-1.0.1" = {
+      name = "cli";
+      packageName = "cli";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
+        sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
+      };
+    };
+    "clipboard-2.0.1" = {
+      name = "clipboard";
+      packageName = "clipboard";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.1.tgz";
+        sha512 = "7yhQBmtN+uYZmfRjjVjKa0dZdWuabzpSKGtyQZN+9C8xlC788SSJjOHWh7tzurfwTqTD5UDYAhIv5fRJg3sHjQ==";
+      };
+    };
+    "clone-1.0.4" = {
+      name = "clone";
+      packageName = "clone";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz";
+        sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
+      };
+    };
+    "co-4.6.0" = {
+      name = "co";
+      packageName = "co";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+      };
+    };
+    "code-point-at-1.1.0" = {
+      name = "code-point-at";
+      packageName = "code-point-at";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    };
+    "coffee-script-1.3.3" = {
+      name = "coffee-script";
+      packageName = "coffee-script";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
+        sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
+      };
+    };
+    "colors-0.6.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+      };
+    };
+    "colors-1.0.3" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
+      };
+    };
+    "combined-stream-1.0.6" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
+      };
+    };
+    "command-line-args-3.0.5" = {
+      name = "command-line-args";
+      packageName = "command-line-args";
+      version = "3.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/command-line-args/-/command-line-args-3.0.5.tgz";
+        sha1 = "5bd4ad45e7983e5c1344918e40280ee2693c5ac0";
+      };
+    };
+    "command-line-usage-3.0.8" = {
+      name = "command-line-usage";
+      packageName = "command-line-usage";
+      version = "3.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-3.0.8.tgz";
+        sha1 = "b6a20978c1b383477f5c11a529428b880bfe0f4d";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "concat-stream-1.6.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+      };
+    };
+    "config-chain-1.1.11" = {
+      name = "config-chain";
+      packageName = "config-chain";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
+        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
+      };
+    };
+    "console-browserify-1.1.0" = {
+      name = "console-browserify";
+      packageName = "console-browserify";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+      };
+    };
+    "console-control-strings-1.1.0" = {
+      name = "console-control-strings";
+      packageName = "console-control-strings";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    };
+    "core-js-2.5.7" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "2.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz";
+        sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "crisper-1.2.0" = {
+      name = "crisper";
+      packageName = "crisper";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crisper/-/crisper-1.2.0.tgz";
+        sha1 = "9a91f597d71f6110294e076ad44dbb3408568e46";
+      };
+    };
+    "crisper-2.1.1" = {
+      name = "crisper";
+      packageName = "crisper";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crisper/-/crisper-2.1.1.tgz";
+        sha512 = "yxfj9nTbFunDASztAxVF8hCPwaZBvTjayNzG3YL/VVQfQaKBXX2+TM3p1xB1Pxd8RYeDQJkJIQRwM3FQSIa+pw==";
+      };
+    };
+    "cryptiles-2.0.5" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+      };
+    };
+    "cycle-1.0.3" = {
+      name = "cycle";
+      packageName = "cycle";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "date-now-0.1.4" = {
+      name = "date-now";
+      packageName = "date-now";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+      };
+    };
+    "dateformat-1.0.2-1.2.3" = {
+      name = "dateformat";
+      packageName = "dateformat";
+      version = "1.0.2-1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
+        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
+      };
+    };
+    "debug-0.7.4" = {
+      name = "debug";
+      packageName = "debug";
+      version = "0.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+        sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+      };
+    };
+    "debug-2.6.9" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+      };
+    };
+    "deep-extend-0.4.2" = {
+      name = "deep-extend";
+      packageName = "deep-extend";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
+        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
+      };
+    };
+    "deep-is-0.1.3" = {
+      name = "deep-is";
+      packageName = "deep-is";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "delegate-3.2.0" = {
+      name = "delegate";
+      packageName = "delegate";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz";
+        sha512 = "IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==";
+      };
+    };
+    "delegates-1.0.0" = {
+      name = "delegates";
+      packageName = "delegates";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    };
+    "doctrine-0.7.2" = {
+      name = "doctrine";
+      packageName = "doctrine";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz";
+        sha1 = "7cb860359ba3be90e040b26b729ce4bfa654c523";
+      };
+    };
+    "dom-serializer-0.1.0" = {
+      name = "dom-serializer";
+      packageName = "dom-serializer";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
+        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      };
+    };
+    "dom5-1.1.0" = {
+      name = "dom5";
+      packageName = "dom5";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom5/-/dom5-1.1.0.tgz";
+        sha1 = "3a0c7700c083ab4c4d26938a78b0f0c6dcc37794";
+      };
+    };
+    "dom5-1.3.6" = {
+      name = "dom5";
+      packageName = "dom5";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom5/-/dom5-1.3.6.tgz";
+        sha1 = "a7088a9fc5f3b08dc9f6eda4c7abaeb241945e0d";
+      };
+    };
+    "domelementtype-1.1.3" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
+        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+      };
+    };
+    "domelementtype-1.3.0" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
+        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+      };
+    };
+    "domhandler-2.3.0" = {
+      name = "domhandler";
+      packageName = "domhandler";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
+        sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
+      };
+    };
+    "domutils-1.5.1" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+      };
+    };
+    "ecc-jsbn-0.1.2" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    };
+    "entities-1.0.0" = {
+      name = "entities";
+      packageName = "entities";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+        sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
+      };
+    };
+    "entities-1.1.1" = {
+      name = "entities";
+      packageName = "entities";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
+        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+      };
+    };
+    "errno-0.1.7" = {
+      name = "errno";
+      packageName = "errno";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
+        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
+      };
+    };
+    "es6-promise-2.3.0" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
+        sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
+      };
+    };
+    "es6-promise-4.2.4" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz";
+        sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "escodegen-1.11.0" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz";
+        sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==";
+      };
+    };
+    "espree-3.5.4" = {
+      name = "espree";
+      packageName = "espree";
+      version = "3.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz";
+        sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
+      };
+    };
+    "esprima-1.0.4" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+      };
+    };
+    "esprima-3.1.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    };
+    "estraverse-3.1.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz";
+        sha1 = "15e28a446b8b82bc700ccc8b96c78af4da0d6cba";
+      };
+    };
+    "estraverse-4.2.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
+        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+      };
+    };
+    "esutils-1.1.6" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
+        sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
+      };
+    };
+    "esutils-2.0.2" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+      };
+    };
+    "eventemitter2-0.4.14" = {
+      name = "eventemitter2";
+      packageName = "eventemitter2";
+      version = "0.4.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+        sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
+      };
+    };
+    "exit-0.1.2" = {
+      name = "exit";
+      packageName = "exit";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
+        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+      };
+    };
+    "extend-3.0.2" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+      };
+    };
+    "extract-zip-1.6.7" = {
+      name = "extract-zip";
+      packageName = "extract-zip";
+      version = "1.6.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz";
+        sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9";
+      };
+    };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "eyes-0.1.8" = {
+      name = "eyes";
+      packageName = "eyes";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+      };
+    };
+    "fast-levenshtein-2.0.6" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+      };
+    };
+    "favico.js-0.3.10" = {
+      name = "favico.js";
+      packageName = "favico.js";
+      version = "0.3.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz";
+        sha1 = "80586e27a117f24a8d51c18a99bdc714d4339301";
+      };
+    };
+    "faye-websocket-0.4.4" = {
+      name = "faye-websocket";
+      packageName = "faye-websocket";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
+        sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
+      };
+    };
+    "fd-slicer-1.0.1" = {
+      name = "fd-slicer";
+      packageName = "fd-slicer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+      };
+    };
+    "feature-detect-es6-1.5.0" = {
+      name = "feature-detect-es6";
+      packageName = "feature-detect-es6";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/feature-detect-es6/-/feature-detect-es6-1.5.0.tgz";
+        sha512 = "DzWPIGzTnfp3/KK1d/YPfmgLqeDju9F2DQYBL35VusgSApcA7XGqVtXfR4ETOOFEzdFJ3J7zh0Gkk011TiA4uQ==";
+      };
+    };
+    "file-sync-cmp-0.1.1" = {
+      name = "file-sync-cmp";
+      packageName = "file-sync-cmp";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz";
+        sha1 = "a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b";
+      };
+    };
+    "find-replace-1.0.3" = {
+      name = "find-replace";
+      packageName = "find-replace";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz";
+        sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0";
+      };
+    };
+    "findit-2.0.0" = {
+      name = "findit";
+      packageName = "findit";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz";
+        sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
+      };
+    };
+    "findup-sync-0.1.3" = {
+      name = "findup-sync";
+      packageName = "findup-sync";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
+        sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
+      };
+    };
+    "foreachasync-3.0.0" = {
+      name = "foreachasync";
+      packageName = "foreachasync";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
+      };
+    };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
+    "form-data-2.1.4" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
+        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
+      };
+    };
+    "fs-extra-0.6.4" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "0.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
+        sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
+      };
+    };
+    "fs-extra-1.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+      };
+    };
+    "fs.extra-1.3.2" = {
+      name = "fs.extra";
+      packageName = "fs.extra";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
+        sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
+      };
+    };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "gauge-2.7.4" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    };
+    "gaze-0.5.2" = {
+      name = "gaze";
+      packageName = "gaze";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz";
+        sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f";
+      };
+    };
+    "getobject-0.1.0" = {
+      name = "getobject";
+      packageName = "getobject";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
+        sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "glob-3.1.21" = {
+      name = "glob";
+      packageName = "glob";
+      version = "3.1.21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
+        sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
+      };
+    };
+    "glob-3.2.11" = {
+      name = "glob";
+      packageName = "glob";
+      version = "3.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+      };
+    };
+    "glob-7.1.2" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+        sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
+      };
+    };
+    "globule-0.1.0" = {
+      name = "globule";
+      packageName = "globule";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
+        sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
+      };
+    };
+    "good-listener-1.2.2" = {
+      name = "good-listener";
+      packageName = "good-listener";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz";
+        sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
+      };
+    };
+    "graceful-fs-1.2.3" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      };
+    };
+    "graceful-fs-4.1.11" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+      };
+    };
     "grunt-0.4.5" = {
       name = "grunt";
       packageName = "grunt";
@@ -13,6 +1211,15 b' let'
         sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
       };
     };
+    "grunt-contrib-concat-0.5.1" = {
+      name = "grunt-contrib-concat";
+      packageName = "grunt-contrib-concat";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.1.tgz";
+        sha1 = "953c6efdfdfd2c107ab9c85077f2d4b24d31cd49";
+      };
+    };
     "grunt-contrib-copy-1.0.0" = {
       name = "grunt-contrib-copy";
       packageName = "grunt-contrib-copy";
@@ -22,15 +1229,6 b' let'
         sha1 = "7060c6581e904b8ab0d00f076e0a8f6e3e7c3573";
       };
     };
-    "grunt-contrib-concat-0.5.1" = {
-      name = "grunt-contrib-concat";
-      packageName = "grunt-contrib-concat";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.1.tgz";
-        sha1 = "953c6efdfdfd2c107ab9c85077f2d4b24d31cd49";
-      };
-    };
     "grunt-contrib-jshint-0.12.0" = {
       name = "grunt-contrib-jshint";
       packageName = "grunt-contrib-jshint";
@@ -58,24 +1256,6 b' let'
         sha1 = "64fdcba25a635f5b4da1b6ce6f90da0aeb6e3f15";
       };
     };
-    "crisper-2.1.1" = {
-      name = "crisper";
-      packageName = "crisper";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crisper/-/crisper-2.1.1.tgz";
-        sha1 = "4cc7321c3e90f3c5cbdc3503217f118fd7d5c51c";
-      };
-    };
-    "vulcanize-1.16.0" = {
-      name = "vulcanize";
-      packageName = "vulcanize";
-      version = "1.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vulcanize/-/vulcanize-1.16.0.tgz";
-        sha1 = "b0ce3b0044d194ad4908ae4f1a6c6110a6e4d5e6";
-      };
-    };
     "grunt-crisper-1.0.1" = {
       name = "grunt-crisper";
       packageName = "grunt-crisper";
@@ -85,6 +1265,33 b' let'
         sha1 = "e7c091dcaff10deb0091e3035ca7e54008991fe7";
       };
     };
+    "grunt-legacy-log-0.1.3" = {
+      name = "grunt-legacy-log";
+      packageName = "grunt-legacy-log";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz";
+        sha1 = "ec29426e803021af59029f87d2f9cd7335a05531";
+      };
+    };
+    "grunt-legacy-log-utils-0.1.1" = {
+      name = "grunt-legacy-log-utils";
+      packageName = "grunt-legacy-log-utils";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz";
+        sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e";
+      };
+    };
+    "grunt-legacy-util-0.2.0" = {
+      name = "grunt-legacy-util";
+      packageName = "grunt-legacy-util";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
+        sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
+      };
+    };
     "grunt-vulcanize-1.0.0" = {
       name = "grunt-vulcanize";
       packageName = "grunt-vulcanize";
@@ -94,437 +1301,31 b' let'
         sha1 = "f4d6cfef274f8216c06f6c290e7dbb3b9e9e3b0f";
       };
     };
-    "node2nix-1.3.0" = {
-      name = "node2nix";
-      packageName = "node2nix";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node2nix/-/node2nix-1.3.0.tgz";
-        sha1 = "e830a3bc5880dd22ae47be71a147f776542850cc";
-      };
-    };
-    "jshint-2.9.5" = {
-      name = "jshint";
-      packageName = "jshint";
-      version = "2.9.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz";
-        sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c";
-      };
-    };
-    "bower-1.8.2" = {
-      name = "bower";
-      packageName = "bower";
-      version = "1.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz";
-        sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7";
-      };
-    };
-    "jquery-1.11.3" = {
-      name = "jquery";
-      packageName = "jquery";
-      version = "1.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jquery/-/jquery-1.11.3.tgz";
-        sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
-      };
-    };
-    "favico.js-0.3.10" = {
-      name = "favico.js";
-      packageName = "favico.js";
-      version = "0.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz";
-        sha1 = "80586e27a117f24a8d51c18a99bdc714d4339301";
-      };
-    };
-    "clipboard-1.7.1" = {
-      name = "clipboard";
-      packageName = "clipboard";
-      version = "1.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz";
-        sha1 = "360d6d6946e99a7a1fef395e42ba92b5e9b5a16b";
-      };
-    };
-    "moment-2.18.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
-        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
-      };
-    };
-    "mousetrap-1.6.1" = {
-      name = "mousetrap";
-      packageName = "mousetrap";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.1.tgz";
-        sha1 = "2a085f5c751294c75e7e81f6ec2545b29cbf42d9";
-      };
-    };
-    "appenlight-client-git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1" = {
-      name = "appenlight-client";
-      packageName = "appenlight-client";
-      version = "0.5.1";
-      src = fetchgit {
-        url = "https://[e-mail]/AppEnlight/appenlight-client-js.git";
-        rev = "14712c64c230fbbe94fcbc8094aef5eb3b90b307";
-        sha256 = "92111f1104cbf0b31303c366c0fa752cf68af7ddde40d0161edd1b5fd9dd07f7";
-      };
-    };
-    "async-0.1.22" = {
-      name = "async";
-      packageName = "async";
-      version = "0.1.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
-        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
-      };
-    };
-    "coffee-script-1.3.3" = {
-      name = "coffee-script";
-      packageName = "coffee-script";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
-        sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
-      };
-    };
-    "colors-0.6.2" = {
-      name = "colors";
-      packageName = "colors";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
-        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
-      };
-    };
-    "dateformat-1.0.2-1.2.3" = {
-      name = "dateformat";
-      packageName = "dateformat";
-      version = "1.0.2-1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
-        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
-      };
-    };
-    "eventemitter2-0.4.14" = {
-      name = "eventemitter2";
-      packageName = "eventemitter2";
-      version = "0.4.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
-        sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
-      };
-    };
-    "findup-sync-0.1.3" = {
-      name = "findup-sync";
-      packageName = "findup-sync";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
-        sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
-      };
-    };
-    "glob-3.1.21" = {
-      name = "glob";
-      packageName = "glob";
-      version = "3.1.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
-        sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
-      };
-    };
-    "hooker-0.2.3" = {
-      name = "hooker";
-      packageName = "hooker";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
-        sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
-      };
-    };
-    "iconv-lite-0.2.11" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
-        sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
-      };
-    };
-    "minimatch-0.2.14" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "0.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
-        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
-      };
-    };
-    "nopt-1.0.10" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
-        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
-      };
-    };
-    "rimraf-2.2.8" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
-      };
-    };
-    "lodash-0.9.2" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "0.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
-        sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
-      };
-    };
-    "underscore.string-2.2.1" = {
-      name = "underscore.string";
-      packageName = "underscore.string";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
-        sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
-      };
-    };
-    "which-1.0.9" = {
-      name = "which";
-      packageName = "which";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
-        sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
-      };
-    };
-    "js-yaml-2.0.5" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
-        sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
-      };
-    };
-    "exit-0.1.2" = {
-      name = "exit";
-      packageName = "exit";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
-        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
-      };
-    };
-    "getobject-0.1.0" = {
-      name = "getobject";
-      packageName = "getobject";
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
+      };
+    };
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+      };
+    };
+    "has-ansi-0.1.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
       version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
-        sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
-      };
-    };
-    "grunt-legacy-util-0.2.0" = {
-      name = "grunt-legacy-util";
-      packageName = "grunt-legacy-util";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
-        sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
-      };
-    };
-    "grunt-legacy-log-0.1.3" = {
-      name = "grunt-legacy-log";
-      packageName = "grunt-legacy-log";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz";
-        sha1 = "ec29426e803021af59029f87d2f9cd7335a05531";
-      };
-    };
-    "glob-3.2.11" = {
-      name = "glob";
-      packageName = "glob";
-      version = "3.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
-      };
-    };
-    "lodash-2.4.2" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
-        sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "minimatch-0.3.0" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
-        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
-      };
-    };
-    "lru-cache-2.7.3" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "2.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
-        sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
-      };
-    };
-    "sigmund-1.0.1" = {
-      name = "sigmund";
-      packageName = "sigmund";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
-        sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
-      };
-    };
-    "graceful-fs-1.2.3" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
-        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
-      };
-    };
-    "inherits-1.0.2" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
-        sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
-      };
-    };
-    "abbrev-1.1.0" = {
-      name = "abbrev";
-      packageName = "abbrev";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
-        sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
-      };
-    };
-    "argparse-0.1.16" = {
-      name = "argparse";
-      packageName = "argparse";
-      version = "0.1.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
-        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
-      };
-    };
-    "esprima-1.0.4" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
-        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
-      };
-    };
-    "underscore-1.7.0" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
-        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
-      };
-    };
-    "underscore.string-2.4.0" = {
-      name = "underscore.string";
-      packageName = "underscore.string";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
-        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
-      };
-    };
-    "grunt-legacy-log-utils-0.1.1" = {
-      name = "grunt-legacy-log-utils";
-      packageName = "grunt-legacy-log-utils";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz";
-        sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e";
-      };
-    };
-    "underscore.string-2.3.3" = {
-      name = "underscore.string";
-      packageName = "underscore.string";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
-        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
-      };
-    };
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
-      };
-    };
-    "file-sync-cmp-0.1.1" = {
-      name = "file-sync-cmp";
-      packageName = "file-sync-cmp";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz";
-        sha1 = "a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b";
-      };
-    };
-    "ansi-styles-2.2.1" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
-      };
-    };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
+        sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
       };
     };
     "has-ansi-2.0.0" = {
@@ -536,148 +1337,94 b' let'
         sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
       };
     };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
-      };
-    };
-    "supports-color-2.0.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
-        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
-      };
-    };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
-      };
-    };
-    "chalk-0.5.1" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
-        sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
-      };
-    };
-    "source-map-0.3.0" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
-        sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
-      };
-    };
-    "ansi-styles-1.1.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
-        sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
-      };
-    };
-    "has-ansi-0.1.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
-        sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
-      };
-    };
-    "strip-ansi-0.3.0" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
-        sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
-      };
-    };
-    "supports-color-0.2.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
-        sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
-      };
-    };
-    "ansi-regex-0.2.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
-        sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
-      };
-    };
-    "amdefine-1.0.1" = {
-      name = "amdefine";
-      packageName = "amdefine";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
-        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
-      };
-    };
-    "async-2.5.0" = {
-      name = "async";
-      packageName = "async";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
-        sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d";
-      };
-    };
-    "less-2.7.2" = {
-      name = "less";
-      packageName = "less";
-      version = "2.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/less/-/less-2.7.2.tgz";
-        sha1 = "368d6cc73e1fb03981183280918743c5dcf9b3df";
-      };
-    };
-    "lodash-4.17.4" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
-      };
-    };
-    "errno-0.1.4" = {
-      name = "errno";
-      packageName = "errno";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
-        sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
-      };
-    };
-    "graceful-fs-4.1.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "4.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
-        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+    "has-unicode-2.0.1" = {
+      name = "has-unicode";
+      packageName = "has-unicode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    };
+    "hasha-2.2.0" = {
+      name = "hasha";
+      packageName = "hasha";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
+      };
+    };
+    "hawk-3.1.3" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+      };
+    };
+    "hoek-2.16.3" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "2.16.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+      };
+    };
+    "hooker-0.2.3" = {
+      name = "hooker";
+      packageName = "hooker";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
+        sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
+      };
+    };
+    "hosted-git-info-2.7.1" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
+        sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
+      };
+    };
+    "htmlparser2-3.8.3" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
+        sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
+      };
+    };
+    "http-signature-1.1.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
+      };
+    };
+    "hydrolysis-1.25.0" = {
+      name = "hydrolysis";
+      packageName = "hydrolysis";
+      version = "1.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.25.0.tgz";
+        sha1 = "a4fb14a37a1e03b0db52d8aaa57c682272a14d84";
+      };
+    };
+    "iconv-lite-0.2.11" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
+        sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
       };
     };
     "image-size-0.5.5" = {
@@ -689,166 +1436,67 b' let'
         sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c";
       };
     };
-    "mime-1.4.0" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz";
-        sha1 = "69e9e0db51d44f2a3b56e48b7817d7d137f1a343";
-      };
-    };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-      };
-    };
-    "promise-7.3.1" = {
-      name = "promise";
-      packageName = "promise";
-      version = "7.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
-      };
-    };
-    "source-map-0.5.7" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
-        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
-      };
-    };
-    "request-2.82.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.82.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.82.0.tgz";
-        sha1 = "2ba8a92cd7ac45660ea2b10a53ae67cd247516ea";
-      };
-    };
-    "prr-0.0.0" = {
-      name = "prr";
-      packageName = "prr";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
-        sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "asap-2.0.6" = {
-      name = "asap";
-      packageName = "asap";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
-        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
-      };
-    };
-    "aws-sign2-0.7.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
-        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
-      };
-    };
-    "aws4-1.6.0" = {
-      name = "aws4";
-      packageName = "aws4";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
-        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
-      };
-    };
-    "caseless-0.12.0" = {
-      name = "caseless";
-      packageName = "caseless";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
-        sha1 = "1b681c21ff84033c826543090689420d187151dc";
-      };
-    };
-    "combined-stream-1.0.5" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
-      };
-    };
-    "extend-3.0.1" = {
-      name = "extend";
-      packageName = "extend";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz";
-        sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
-      };
-    };
-    "forever-agent-0.6.1" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
-        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
-      };
-    };
-    "form-data-2.3.1" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz";
-        sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf";
-      };
-    };
-    "har-validator-5.0.3" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz";
-        sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
-      };
-    };
-    "hawk-6.0.2" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz";
-        sha1 = "af4d914eb065f9b5ce4d9d11c1cb2126eecc3038";
-      };
-    };
-    "http-signature-1.2.0" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
-        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-1.0.2" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
+        sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "ini-1.3.5" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+      };
+    };
+    "is-builtin-module-1.0.0" = {
+      name = "is-builtin-module";
+      packageName = "is-builtin-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
+        sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
+      };
+    };
+    "is-fullwidth-code-point-1.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -860,6 +1508,33 b' let'
         sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
       };
     };
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "isexe-2.0.0" = {
+      name = "isexe";
+      packageName = "isexe";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+      };
+    };
     "isstream-0.1.2" = {
       name = "isstream";
       packageName = "isstream";
@@ -869,6 +1544,60 b' let'
         sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     };
+    "jquery-1.11.3" = {
+      name = "jquery";
+      packageName = "jquery";
+      version = "1.11.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jquery/-/jquery-1.11.3.tgz";
+        sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
+      };
+    };
+    "js-yaml-2.0.5" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
+        sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
+      };
+    };
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    };
+    "jshint-2.9.6" = {
+      name = "jshint";
+      packageName = "jshint";
+      version = "2.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz";
+        sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "json-stable-stringify-1.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+      };
+    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -878,157 +1607,22 b' let'
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.17" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz";
-        sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a";
-      };
-    };
-    "oauth-sign-0.8.2" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
-        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
-      };
-    };
-    "performance-now-2.1.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
-        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
-      };
-    };
-    "qs-6.5.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha1 = "349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8";
-      };
-    };
-    "safe-buffer-5.1.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha1 = "893312af69b2123def71f57889001671eeb2c853";
-      };
-    };
-    "stringstream-0.0.5" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
-      };
-    };
-    "tough-cookie-2.3.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
-        sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
-      };
-    };
-    "tunnel-agent-0.6.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
-        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
-      };
-    };
-    "uuid-3.1.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
-      };
-    };
-    "delayed-stream-1.0.0" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-      };
-    };
-    "asynckit-0.4.0" = {
-      name = "asynckit";
-      packageName = "asynckit";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
-        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
-      };
-    };
-    "ajv-5.2.2" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "5.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz";
-        sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39";
-      };
-    };
-    "har-schema-2.0.0" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
-        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
-      };
-    };
-    "co-4.6.0" = {
-      name = "co";
-      packageName = "co";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
-        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
-      };
-    };
-    "fast-deep-equal-1.0.0" = {
-      name = "fast-deep-equal";
-      packageName = "fast-deep-equal";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz";
-        sha1 = "96256a3bc975595eb36d82e9929d060d893439ff";
-      };
-    };
-    "json-schema-traverse-0.3.1" = {
-      name = "json-schema-traverse";
-      packageName = "json-schema-traverse";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
-        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
-      };
-    };
-    "json-stable-stringify-1.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
+    "jsonfile-1.0.1" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
-        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
+        sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
+      };
+    };
+    "jsonfile-2.4.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
+        sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
       };
     };
     "jsonify-0.0.0" = {
@@ -1040,60 +1634,6 b' let'
         sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
       };
     };
-    "hoek-4.2.0" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz";
-        sha1 = "72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d";
-      };
-    };
-    "boom-4.3.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
-        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
-      };
-    };
-    "cryptiles-3.1.2" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
-        sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
-      };
-    };
-    "sntp-2.0.2" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz";
-        sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b";
-      };
-    };
-    "boom-5.2.0" = {
-      name = "boom";
-      packageName = "boom";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
-        sha1 = "5dd9da6ee3a5f302077436290cb717d3f4a54e02";
-      };
-    };
-    "assert-plus-1.0.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
-        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
-      };
-    };
     "jsprim-1.4.1" = {
       name = "jsprim";
       packageName = "jsprim";
@@ -1103,166 +1643,49 b' let'
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "sshpk-1.13.1" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz";
-        sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
-      };
-    };
-    "extsprintf-1.3.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
-        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
-      };
-    };
-    "json-schema-0.2.3" = {
-      name = "json-schema";
-      packageName = "json-schema";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
-        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
-      };
-    };
-    "verror-1.10.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
-        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
-      };
-    };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-      };
-    };
-    "asn1-0.2.3" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
-        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
-      };
-    };
-    "dashdash-1.14.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
-      };
-    };
-    "getpass-0.1.7" = {
-      name = "getpass";
-      packageName = "getpass";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
-        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
-      };
-    };
-    "jsbn-0.1.1" = {
-      name = "jsbn";
-      packageName = "jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
-        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
-      };
-    };
-    "tweetnacl-0.14.5" = {
-      name = "tweetnacl";
-      packageName = "tweetnacl";
-      version = "0.14.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
-        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
-      };
-    };
-    "ecc-jsbn-0.1.1" = {
-      name = "ecc-jsbn";
-      packageName = "ecc-jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
-        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
-      };
-    };
-    "bcrypt-pbkdf-1.0.1" = {
-      name = "bcrypt-pbkdf";
-      packageName = "bcrypt-pbkdf";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
-        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
-      };
-    };
-    "mime-db-1.30.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.30.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz";
-        sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
-    "gaze-0.5.2" = {
-      name = "gaze";
-      packageName = "gaze";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz";
-        sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f";
-      };
-    };
-    "tiny-lr-fork-0.0.5" = {
-      name = "tiny-lr-fork";
-      packageName = "tiny-lr-fork";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz";
-        sha1 = "1e99e1e2a8469b736ab97d97eefa98c71f76ed0a";
-      };
-    };
-    "async-0.2.10" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
-      };
-    };
-    "globule-0.1.0" = {
-      name = "globule";
-      packageName = "globule";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
-        sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
+    "kew-0.7.0" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
+      };
+    };
+    "klaw-1.3.1" = {
+      name = "klaw";
+      packageName = "klaw";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
+        sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
+      };
+    };
+    "less-2.7.3" = {
+      name = "less";
+      packageName = "less";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz";
+        sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==";
+      };
+    };
+    "levn-0.3.0" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
+        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
+      };
+    };
+    "lodash-0.9.2" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "0.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
+        sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
       };
     };
     "lodash-1.0.2" = {
@@ -1274,40 +1697,193 b' let'
         sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
       };
     };
-    "qs-0.5.6" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.5.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
-        sha1 = "31b1ad058567651c526921506b9a8793911a0384";
-      };
-    };
-    "faye-websocket-0.4.4" = {
-      name = "faye-websocket";
-      packageName = "faye-websocket";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
-        sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
-      };
-    };
-    "noptify-0.0.3" = {
-      name = "noptify";
-      packageName = "noptify";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz";
-        sha1 = "58f654a73d9753df0c51d9686dc92104a67f4bbb";
-      };
-    };
-    "debug-0.7.4" = {
-      name = "debug";
-      packageName = "debug";
-      version = "0.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
-        sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+    "lodash-2.4.2" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+        sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
+      };
+    };
+    "lodash-4.17.10" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+        sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
+      };
+    };
+    "lru-cache-2.7.3" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+        sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
+      };
+    };
+    "mime-1.6.0" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
+      };
+    };
+    "mime-db-1.35.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.35.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
+        sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
+      };
+    };
+    "mime-types-2.1.19" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
+        sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
+      };
+    };
+    "minimatch-0.2.14" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "0.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+      };
+    };
+    "minimatch-0.3.0" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "minipass-2.3.3" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz";
+        sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==";
+      };
+    };
+    "minizlib-1.1.0" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
+        sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
+      };
+    };
+    "mkdirp-0.3.5" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "moment-2.22.2" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.22.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
+        sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
+      };
+    };
+    "mousetrap-1.6.2" = {
+      name = "mousetrap";
+      packageName = "mousetrap";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.2.tgz";
+        sha512 = "jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA==";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "ncp-0.4.2" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
+      };
+    };
+    "nijs-0.0.25" = {
+      name = "nijs";
+      packageName = "nijs";
+      version = "0.0.25";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz";
+        sha1 = "04b035cb530d46859d1018839a518c029133f676";
+      };
+    };
+    "node2nix-1.6.0" = {
+      name = "node2nix";
+      packageName = "node2nix";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node2nix/-/node2nix-1.6.0.tgz";
+        sha512 = "MJY6SsQH3pN59R9N3nMz/L8BsbQ0DlvSF38mgg1fwfwgnaJ+y600s3Nd0vZ+cnETUH+4OPETc4QohflccjPUYw==";
+      };
+    };
+    "nopt-1.0.10" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
     "nopt-2.0.0" = {
@@ -1319,204 +1895,6 b' let'
         sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
       };
     };
-    "command-line-args-3.0.5" = {
-      name = "command-line-args";
-      packageName = "command-line-args";
-      version = "3.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/command-line-args/-/command-line-args-3.0.5.tgz";
-        sha1 = "5bd4ad45e7983e5c1344918e40280ee2693c5ac0";
-      };
-    };
-    "command-line-usage-3.0.8" = {
-      name = "command-line-usage";
-      packageName = "command-line-usage";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-3.0.8.tgz";
-        sha1 = "b6a20978c1b383477f5c11a529428b880bfe0f4d";
-      };
-    };
-    "dom5-1.3.6" = {
-      name = "dom5";
-      packageName = "dom5";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom5/-/dom5-1.3.6.tgz";
-        sha1 = "a7088a9fc5f3b08dc9f6eda4c7abaeb241945e0d";
-      };
-    };
-    "array-back-1.0.4" = {
-      name = "array-back";
-      packageName = "array-back";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz";
-        sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b";
-      };
-    };
-    "feature-detect-es6-1.3.1" = {
-      name = "feature-detect-es6";
-      packageName = "feature-detect-es6";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/feature-detect-es6/-/feature-detect-es6-1.3.1.tgz";
-        sha1 = "f888736af9cb0c91f55663bfa4762eb96ee7047f";
-      };
-    };
-    "find-replace-1.0.3" = {
-      name = "find-replace";
-      packageName = "find-replace";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz";
-        sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0";
-      };
-    };
-    "typical-2.6.1" = {
-      name = "typical";
-      packageName = "typical";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz";
-        sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
-      };
-    };
-    "test-value-2.1.0" = {
-      name = "test-value";
-      packageName = "test-value";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz";
-        sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291";
-      };
-    };
-    "ansi-escape-sequences-3.0.0" = {
-      name = "ansi-escape-sequences";
-      packageName = "ansi-escape-sequences";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz";
-        sha1 = "1c18394b6af9b76ff9a63509fa497669fd2ce53e";
-      };
-    };
-    "table-layout-0.3.0" = {
-      name = "table-layout";
-      packageName = "table-layout";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table-layout/-/table-layout-0.3.0.tgz";
-        sha1 = "6ee20dc483db371b3e5c87f704ed2f7c799d2c9a";
-      };
-    };
-    "core-js-2.5.1" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "2.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz";
-        sha1 = "ae6874dc66937789b80754ff5428df66819ca50b";
-      };
-    };
-    "deep-extend-0.4.2" = {
-      name = "deep-extend";
-      packageName = "deep-extend";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
-        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
-      };
-    };
-    "wordwrapjs-2.0.0" = {
-      name = "wordwrapjs";
-      packageName = "wordwrapjs";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-2.0.0.tgz";
-        sha1 = "ab55f695e6118da93858fdd70c053d1c5e01ac20";
-      };
-    };
-    "reduce-flatten-1.0.1" = {
-      name = "reduce-flatten";
-      packageName = "reduce-flatten";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
-        sha1 = "258c78efd153ddf93cb561237f61184f3696e327";
-      };
-    };
-    "@types/clone-0.1.30" = {
-      name = "@types/clone";
-      packageName = "@types/clone";
-      version = "0.1.30";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz";
-        sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
-      };
-    };
-    "@types/node-4.2.20" = {
-      name = "@types/node";
-      packageName = "@types/node";
-      version = "4.2.20";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-4.2.20.tgz";
-        sha1 = "3f7dceff43e07cfff4407fc3495d98a533b32267";
-      };
-    };
-    "@types/parse5-0.0.31" = {
-      name = "@types/parse5";
-      packageName = "@types/parse5";
-      version = "0.0.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/parse5/-/parse5-0.0.31.tgz";
-        sha1 = "e827a493a443b156e1b582a2e4c3bdc0040f2ee7";
-      };
-    };
-    "clone-1.0.2" = {
-      name = "clone";
-      packageName = "clone";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz";
-        sha1 = "260b7a99ebb1edfe247538175f783243cb19d149";
-      };
-    };
-    "parse5-1.5.1" = {
-      name = "parse5";
-      packageName = "parse5";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
-        sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
-      };
-    };
-    "@types/node-6.0.88" = {
-      name = "@types/node";
-      packageName = "@types/node";
-      version = "6.0.88";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz";
-        sha1 = "f618f11a944f6a18d92b5c472028728a3e3d4b66";
-      };
-    };
-    "es6-promise-2.3.0" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
-        sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
-      };
-    };
-    "hydrolysis-1.25.0" = {
-      name = "hydrolysis";
-      packageName = "hydrolysis";
-      version = "1.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.25.0.tgz";
-        sha1 = "a4fb14a37a1e03b0db52d8aaa57c682272a14d84";
-      };
-    };
     "nopt-3.0.6" = {
       name = "nopt";
       packageName = "nopt";
@@ -1526,157 +1904,103 b' let'
         sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
       };
     };
-    "path-posix-1.0.0" = {
-      name = "path-posix";
-      packageName = "path-posix";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz";
-        sha1 = "06b26113f56beab042545a23bfa88003ccac260f";
-      };
-    };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
-      };
-    };
-    "babel-polyfill-6.26.0" = {
-      name = "babel-polyfill";
-      packageName = "babel-polyfill";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz";
-        sha1 = "379937abc67d7895970adc621f284cd966cf2153";
-      };
-    };
-    "doctrine-0.7.2" = {
-      name = "doctrine";
-      packageName = "doctrine";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz";
-        sha1 = "7cb860359ba3be90e040b26b729ce4bfa654c523";
-      };
-    };
-    "dom5-1.1.0" = {
-      name = "dom5";
-      packageName = "dom5";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom5/-/dom5-1.1.0.tgz";
-        sha1 = "3a0c7700c083ab4c4d26938a78b0f0c6dcc37794";
-      };
-    };
-    "escodegen-1.9.0" = {
-      name = "escodegen";
-      packageName = "escodegen";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz";
-        sha1 = "9811a2f265dc1cd3894420ee3717064b632b8852";
-      };
-    };
-    "espree-3.5.1" = {
-      name = "espree";
-      packageName = "espree";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz";
-        sha1 = "0c988b8ab46db53100a1954ae4ba995ddd27d87e";
-      };
-    };
-    "estraverse-3.1.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz";
-        sha1 = "15e28a446b8b82bc700ccc8b96c78af4da0d6cba";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
+    "noptify-0.0.3" = {
+      name = "noptify";
+      packageName = "noptify";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz";
+        sha1 = "58f654a73d9753df0c51d9686dc92104a67f4bbb";
+      };
+    };
+    "normalize-package-data-2.4.0" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
+        sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==";
+      };
+    };
+    "npm-package-arg-6.1.0" = {
+      name = "npm-package-arg";
+      packageName = "npm-package-arg";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz";
+        sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==";
+      };
+    };
+    "npm-registry-client-8.5.1" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "8.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz";
+        sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==";
+      };
+    };
+    "npmconf-2.1.3" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.3.tgz";
+        sha512 = "iTK+HI68GceCoGOHAQiJ/ik1iDfI7S+cgyG8A+PP18IU3X83kRhQIRhAUNj4Bp2JMx6Zrt5kCiozYa9uGWTjhA==";
+      };
+    };
+    "npmlog-4.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
-      };
-    };
-    "babel-runtime-6.26.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
-        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
-      };
-    };
-    "regenerator-runtime-0.10.5" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.10.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
-        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
-      };
-    };
-    "regenerator-runtime-0.11.0" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz";
-        sha1 = "7e54fe5b5ccd5d6624ea6255c3473be090b802e1";
-      };
-    };
-    "esutils-1.1.6" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
-        sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
-      };
-    };
-    "isarray-0.0.1" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-      };
-    };
-    "estraverse-4.2.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
-        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
-      };
-    };
-    "esutils-2.0.2" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
-      };
-    };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "oauth-sign-0.8.2" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
+        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
+      };
+    };
+    "object-assign-4.1.1" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    };
+    "once-1.3.3" = {
+      name = "once";
+      packageName = "once";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
+        sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
     "optionator-0.8.2" = {
@@ -1688,96 +2012,6 b' let'
         sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
       };
     };
-    "prelude-ls-1.1.2" = {
-      name = "prelude-ls";
-      packageName = "prelude-ls";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
-        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
-      };
-    };
-    "deep-is-0.1.3" = {
-      name = "deep-is";
-      packageName = "deep-is";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
-        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
-      };
-    };
-    "wordwrap-1.0.0" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
-      };
-    };
-    "type-check-0.3.2" = {
-      name = "type-check";
-      packageName = "type-check";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
-        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
-      };
-    };
-    "levn-0.3.0" = {
-      name = "levn";
-      packageName = "levn";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
-        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
-      };
-    };
-    "fast-levenshtein-2.0.6" = {
-      name = "fast-levenshtein";
-      packageName = "fast-levenshtein";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
-        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
-      };
-    };
-    "acorn-5.1.2" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "5.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz";
-        sha1 = "911cb53e036807cf0fa778dc5d370fbd864246d7";
-      };
-    };
-    "acorn-jsx-3.0.1" = {
-      name = "acorn-jsx";
-      packageName = "acorn-jsx";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
-        sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
-      };
-    };
-    "object-assign-4.1.1" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
-      };
-    };
-    "crisper-1.2.0" = {
-      name = "crisper";
-      packageName = "crisper";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crisper/-/crisper-1.2.0.tgz";
-        sha1 = "9a91f597d71f6110294e076ad44dbb3408568e46";
-      };
-    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -1787,303 +2021,6 b' let'
         sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";
       };
     };
-    "semver-5.4.1" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
-      };
-    };
-    "npm-registry-client-8.4.0" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
-      };
-    };
-    "npmconf-2.1.2" = {
-      name = "npmconf";
-      packageName = "npmconf";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
-        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
-      };
-    };
-    "tar-3.1.15" = {
-      name = "tar";
-      packageName = "tar";
-      version = "3.1.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
-        sha1 = "cccdc35b90917d58e4c3837795d5d022d7a1f46f";
-      };
-    };
-    "temp-0.8.3" = {
-      name = "temp";
-      packageName = "temp";
-      version = "0.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
-        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
-      };
-    };
-    "fs.extra-1.3.2" = {
-      name = "fs.extra";
-      packageName = "fs.extra";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
-        sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
-      };
-    };
-    "findit-2.0.0" = {
-      name = "findit";
-      packageName = "findit";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz";
-        sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
-      };
-    };
-    "base64-js-1.2.1" = {
-      name = "base64-js";
-      packageName = "base64-js";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz";
-        sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886";
-      };
-    };
-    "slasp-0.0.4" = {
-      name = "slasp";
-      packageName = "slasp";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
-        sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
-      };
-    };
-    "nijs-0.0.23" = {
-      name = "nijs";
-      packageName = "nijs";
-      version = "0.0.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
-        sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
-      };
-    };
-    "concat-stream-1.6.0" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
-        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
-      };
-    };
-    "normalize-package-data-2.4.0" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
-      };
-    };
-    "npm-package-arg-5.1.2" = {
-      name = "npm-package-arg";
-      packageName = "npm-package-arg";
-      version = "5.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
-      };
-    };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
-      };
-    };
-    "retry-0.10.1" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
-        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
-      };
-    };
-    "slide-1.1.6" = {
-      name = "slide";
-      packageName = "slide";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
-        sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
-      };
-    };
-    "ssri-4.1.6" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "4.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
-      };
-    };
-    "npmlog-4.1.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
-      };
-    };
-    "typedarray-0.0.6" = {
-      name = "typedarray";
-      packageName = "typedarray";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
-        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
-      };
-    };
-    "readable-stream-2.3.3" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
-      };
-    };
-    "isarray-1.0.0" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
-      };
-    };
-    "process-nextick-args-1.0.7" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
-        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
-      };
-    };
-    "string_decoder-1.0.3" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
-      };
-    };
-    "util-deprecate-1.0.2" = {
-      name = "util-deprecate";
-      packageName = "util-deprecate";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
-      };
-    };
-    "hosted-git-info-2.5.0" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
-      };
-    };
-    "is-builtin-module-1.0.0" = {
-      name = "is-builtin-module";
-      packageName = "is-builtin-module";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
-        sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
-      };
-    };
-    "validate-npm-package-license-3.0.1" = {
-      name = "validate-npm-package-license";
-      packageName = "validate-npm-package-license";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
-        sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
-      };
-    };
-    "builtin-modules-1.1.1" = {
-      name = "builtin-modules";
-      packageName = "builtin-modules";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
-        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
-      };
-    };
-    "spdx-correct-1.0.2" = {
-      name = "spdx-correct";
-      packageName = "spdx-correct";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz";
-        sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
-      };
-    };
-    "spdx-expression-parse-1.0.4" = {
-      name = "spdx-expression-parse";
-      packageName = "spdx-expression-parse";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
-        sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
-      };
-    };
-    "spdx-license-ids-1.2.2" = {
-      name = "spdx-license-ids";
-      packageName = "spdx-license-ids";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz";
-        sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57";
-      };
-    };
-    "osenv-0.1.4" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
-        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
-      };
-    };
-    "validate-npm-package-name-3.0.0" = {
-      name = "validate-npm-package-name";
-      packageName = "validate-npm-package-name";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
-        sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
-      };
-    };
     "os-homedir-1.0.2" = {
       name = "os-homedir";
       packageName = "os-homedir";
@@ -2102,184 +2039,130 b' let'
         sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
-    "builtins-1.0.3" = {
-      name = "builtins";
-      packageName = "builtins";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz";
-        sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
-      };
-    };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
-      };
-    };
-    "are-we-there-yet-1.1.4" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz";
-        sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
-      };
-    };
-    "console-control-strings-1.1.0" = {
-      name = "console-control-strings";
-      packageName = "console-control-strings";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
-        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
-      };
-    };
-    "gauge-2.7.4" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "2.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
-        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
-      };
-    };
-    "set-blocking-2.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
-        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
-      };
-    };
-    "delegates-1.0.0" = {
-      name = "delegates";
-      packageName = "delegates";
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+      };
+    };
+    "parse5-1.5.1" = {
+      name = "parse5";
+      packageName = "parse5";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
+        sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "path-posix-1.0.0" = {
+      name = "path-posix";
+      packageName = "path-posix";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
-        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
-      };
-    };
-    "aproba-1.2.0" = {
-      name = "aproba";
-      packageName = "aproba";
+        url = "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz";
+        sha1 = "06b26113f56beab042545a23bfa88003ccac260f";
+      };
+    };
+    "pend-1.2.0" = {
+      name = "pend";
+      packageName = "pend";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a";
-      };
-    };
-    "has-unicode-2.0.1" = {
-      name = "has-unicode";
-      packageName = "has-unicode";
+        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+      };
+    };
+    "performance-now-0.2.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
+        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+      };
+    };
+    "phantom-4.0.12" = {
+      name = "phantom";
+      packageName = "phantom";
+      version = "4.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phantom/-/phantom-4.0.12.tgz";
+        sha512 = "Tz82XhtPmwCk1FFPmecy7yRGZG2btpzY2KI9fcoPT7zT9det0CcMyfBFPp1S8DqzsnQnm8ZYEfdy528mwVtksA==";
+      };
+    };
+    "phantomjs-prebuilt-2.1.16" = {
+      name = "phantomjs-prebuilt";
+      packageName = "phantomjs-prebuilt";
+      version = "2.1.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz";
+        sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef";
+      };
+    };
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    };
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
-        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
-      };
-    };
-    "signal-exit-3.0.2" = {
-      name = "signal-exit";
-      packageName = "signal-exit";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
-      };
-    };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
-      };
-    };
-    "wide-align-1.1.2" = {
-      name = "wide-align";
-      packageName = "wide-align";
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    };
+    "prelude-ls-1.1.2" = {
+      name = "prelude-ls";
+      packageName = "prelude-ls";
       version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
-      };
-    };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
-      };
-    };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
-      };
-    };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
-      };
-    };
-    "config-chain-1.1.11" = {
-      name = "config-chain";
-      packageName = "config-chain";
-      version = "1.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
-        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
-      };
-    };
-    "ini-1.3.4" = {
-      name = "ini";
-      packageName = "ini";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
-        sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
-      };
-    };
-    "once-1.3.3" = {
-      name = "once";
-      packageName = "once";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
-        sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
-      };
-    };
-    "semver-4.3.6" = {
-      name = "semver";
-      packageName = "semver";
-      version = "4.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
-        sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
-      };
-    };
-    "uid-number-0.0.5" = {
-      name = "uid-number";
-      packageName = "uid-number";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
-        sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
+        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
+        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
+      };
+    };
+    "process-nextick-args-2.0.0" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
+      };
+    };
+    "progress-1.1.8" = {
+      name = "progress";
+      packageName = "progress";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
+      };
+    };
+    "promise-7.3.1" = {
+      name = "promise";
+      packageName = "promise";
+      version = "7.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
+        sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
       };
     };
     "proto-list-1.2.4" = {
@@ -2291,238 +2174,49 b' let'
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "minipass-2.2.1" = {
-      name = "minipass";
-      packageName = "minipass";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
-        sha1 = "5ada97538b1027b4cf7213432428578cb564011f";
-      };
-    };
-    "minizlib-1.0.3" = {
-      name = "minizlib";
-      packageName = "minizlib";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz";
-        sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5";
-      };
-    };
-    "yallist-3.0.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
-        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
-      };
-    };
-    "fs-extra-0.6.4" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "0.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
-        sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
-      };
-    };
-    "mkdirp-0.3.5" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
-      };
-    };
-    "walk-2.3.9" = {
-      name = "walk";
-      packageName = "walk";
-      version = "2.3.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
-        sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
-      };
-    };
-    "ncp-0.4.2" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
-        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
-      };
-    };
-    "jsonfile-1.0.1" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
-        sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
-      };
-    };
-    "foreachasync-3.0.0" = {
-      name = "foreachasync";
-      packageName = "foreachasync";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
-        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
-      };
-    };
-    "cli-1.0.1" = {
-      name = "cli";
-      packageName = "cli";
+    "prr-1.0.1" = {
+      name = "prr";
+      packageName = "prr";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
-        sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
-      };
-    };
-    "console-browserify-1.1.0" = {
-      name = "console-browserify";
-      packageName = "console-browserify";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
-      };
-    };
-    "htmlparser2-3.8.3" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
-        sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
-      };
-    };
-    "minimatch-3.0.4" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
-      };
-    };
-    "shelljs-0.3.0" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
-        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
-      };
-    };
-    "strip-json-comments-1.0.4" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
-      };
-    };
-    "lodash-3.7.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "3.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
-        sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
-      };
-    };
-    "glob-7.1.2" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
-      };
-    };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
-      };
-    };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
-      };
-    };
-    "brace-expansion-1.1.8" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
-        sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
-      };
-    };
-    "balanced-match-1.0.0" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
-        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
-    "date-now-0.1.4" = {
-      name = "date-now";
-      packageName = "date-now";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
-        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
-      };
-    };
-    "domhandler-2.3.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
-        sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
-      };
-    };
-    "domutils-1.5.1" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
-        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
-      };
-    };
-    "domelementtype-1.3.0" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
-        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+        url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz";
+        sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "qrious-4.0.2" = {
+      name = "qrious";
+      packageName = "qrious";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qrious/-/qrious-4.0.2.tgz";
+        sha512 = "xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==";
+      };
+    };
+    "qs-0.5.6" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.5.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
+        sha1 = "31b1ad058567651c526921506b9a8793911a0384";
+      };
+    };
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
     "readable-stream-1.1.14" = {
@@ -2534,58 +2228,94 b' let'
         sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
       };
     };
-    "entities-1.0.0" = {
-      name = "entities";
-      packageName = "entities";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
-        sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
-      };
-    };
-    "dom-serializer-0.1.0" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
-        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
-      };
-    };
-    "domelementtype-1.1.3" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
-        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
-      };
-    };
-    "entities-1.1.1" = {
-      name = "entities";
-      packageName = "entities";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
-        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
-      };
-    };
-    "string_decoder-0.10.31" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "0.10.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
-      };
-    };
-    "good-listener-1.2.2" = {
-      name = "good-listener";
-      packageName = "good-listener";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz";
-        sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
+    "readable-stream-2.3.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+      };
+    };
+    "reduce-flatten-1.0.1" = {
+      name = "reduce-flatten";
+      packageName = "reduce-flatten";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
+        sha1 = "258c78efd153ddf93cb561237f61184f3696e327";
+      };
+    };
+    "regenerator-runtime-0.10.5" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
+        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
+      };
+    };
+    "regenerator-runtime-0.11.1" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
+        sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
+      };
+    };
+    "request-2.81.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.81.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
+    "request-progress-2.0.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+      };
+    };
+    "retry-0.10.1" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
+        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
+      };
+    };
+    "rimraf-2.2.8" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "select-1.1.2" = {
@@ -2597,88 +2327,734 b' let'
         sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
       };
     };
+    "semver-4.3.6" = {
+      name = "semver";
+      packageName = "semver";
+      version = "4.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
+        sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
+      };
+    };
+    "semver-5.5.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
+        sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
+      };
+    };
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
+    "shelljs-0.3.0" = {
+      name = "shelljs";
+      packageName = "shelljs";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
+        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
+      };
+    };
+    "sigmund-1.0.1" = {
+      name = "sigmund";
+      packageName = "sigmund";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+        sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+      };
+    };
+    "signal-exit-3.0.2" = {
+      name = "signal-exit";
+      packageName = "signal-exit";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      };
+    };
+    "slasp-0.0.4" = {
+      name = "slasp";
+      packageName = "slasp";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
+        sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
+      };
+    };
+    "slide-1.1.6" = {
+      name = "slide";
+      packageName = "slide";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
+        sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
+      };
+    };
+    "sntp-1.0.9" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+      };
+    };
+    "source-map-0.3.0" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
+        sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
+      };
+    };
+    "source-map-0.5.7" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    };
+    "source-map-0.6.1" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+      };
+    };
+    "spdx-correct-3.0.0" = {
+      name = "spdx-correct";
+      packageName = "spdx-correct";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
+        sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
+      };
+    };
+    "spdx-exceptions-2.1.0" = {
+      name = "spdx-exceptions";
+      packageName = "spdx-exceptions";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
+        sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
+      };
+    };
+    "spdx-expression-parse-3.0.0" = {
+      name = "spdx-expression-parse";
+      packageName = "spdx-expression-parse";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
+      };
+    };
+    "spdx-license-ids-3.0.0" = {
+      name = "spdx-license-ids";
+      packageName = "spdx-license-ids";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
+        sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
+      };
+    };
+    "split-1.0.1" = {
+      name = "split";
+      packageName = "split";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
+        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
+      };
+    };
+    "sshpk-1.14.2" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.14.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
+        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
+      };
+    };
+    "ssri-5.3.0" = {
+      name = "ssri";
+      packageName = "ssri";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz";
+        sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==";
+      };
+    };
+    "stack-trace-0.0.10" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
+        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
+      };
+    };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
+    "string_decoder-1.1.1" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+      };
+    };
+    "stringstream-0.0.6" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz";
+        sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==";
+      };
+    };
+    "strip-ansi-0.3.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
+        sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "strip-json-comments-1.0.4" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+      };
+    };
+    "supports-color-0.2.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
+        sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
+    "table-layout-0.3.0" = {
+      name = "table-layout";
+      packageName = "table-layout";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table-layout/-/table-layout-0.3.0.tgz";
+        sha1 = "6ee20dc483db371b3e5c87f704ed2f7c799d2c9a";
+      };
+    };
+    "tar-3.1.15" = {
+      name = "tar";
+      packageName = "tar";
+      version = "3.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
+        sha512 = "pQNFsg+Wb6VXsrIPUnuQwrHR4wD5ASBR0jRyiT4/AALFA2Nl+CjhkDX5fTmIwCuULRtyQR3Dae2BBnP2EFHscw==";
+      };
+    };
+    "temp-0.8.3" = {
+      name = "temp";
+      packageName = "temp";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
+        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
+      };
+    };
+    "test-value-2.1.0" = {
+      name = "test-value";
+      packageName = "test-value";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz";
+        sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291";
+      };
+    };
+    "throttleit-1.0.0" = {
+      name = "throttleit";
+      packageName = "throttleit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
+      };
+    };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
     "tiny-emitter-2.0.2" = {
       name = "tiny-emitter";
       packageName = "tiny-emitter";
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz";
-        sha1 = "82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c";
-      };
-    };
-    "delegate-3.1.3" = {
-      name = "delegate";
-      packageName = "delegate";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz";
-        sha1 = "9a8251a777d7025faa55737bc3b071742127a9fd";
+        sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==";
+      };
+    };
+    "tiny-lr-fork-0.0.5" = {
+      name = "tiny-lr-fork";
+      packageName = "tiny-lr-fork";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz";
+        sha1 = "1e99e1e2a8469b736ab97d97eefa98c71f76ed0a";
+      };
+    };
+    "tough-cookie-2.3.4" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
+    "type-check-0.3.2" = {
+      name = "type-check";
+      packageName = "type-check";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
+        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+      };
+    };
+    "typedarray-0.0.6" = {
+      name = "typedarray";
+      packageName = "typedarray";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    };
+    "typical-2.6.1" = {
+      name = "typical";
+      packageName = "typical";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz";
+        sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
+      };
+    };
+    "uid-number-0.0.5" = {
+      name = "uid-number";
+      packageName = "uid-number";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
+        sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
+      };
+    };
+    "underscore-1.7.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+      };
+    };
+    "underscore.string-2.2.1" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
+        sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
+      };
+    };
+    "underscore.string-2.3.3" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
+        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
+      };
+    };
+    "underscore.string-2.4.0" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
+        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
+      };
+    };
+    "unicode-5.2.0-0.7.5" = {
+      name = "unicode-5.2.0";
+      packageName = "unicode-5.2.0";
+      version = "0.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unicode-5.2.0/-/unicode-5.2.0-0.7.5.tgz";
+        sha512 = "KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA==";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
+    "uuid-3.3.2" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+      };
+    };
+    "validate-npm-package-license-3.0.3" = {
+      name = "validate-npm-package-license";
+      packageName = "validate-npm-package-license";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz";
+        sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==";
+      };
+    };
+    "validate-npm-package-name-3.0.0" = {
+      name = "validate-npm-package-name";
+      packageName = "validate-npm-package-name";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
+        sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
+      };
+    };
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    };
+    "vulcanize-1.16.0" = {
+      name = "vulcanize";
+      packageName = "vulcanize";
+      version = "1.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vulcanize/-/vulcanize-1.16.0.tgz";
+        sha512 = "TYlFljSc896b5+0FmMiw0JAMrHNBiHx0IAFC/dQR3Dxdb9Nx43ohm6wMWTlPXQn4sk/0WkqfgoAA6SLxyvPCLQ==";
+      };
+    };
+    "walk-2.3.14" = {
+      name = "walk";
+      packageName = "walk";
+      version = "2.3.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz";
+        sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==";
+      };
+    };
+    "which-1.0.9" = {
+      name = "which";
+      packageName = "which";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
+        sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
+      };
+    };
+    "which-1.3.1" = {
+      name = "which";
+      packageName = "which";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
+      };
+    };
+    "wide-align-1.1.3" = {
+      name = "wide-align";
+      packageName = "wide-align";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+      };
+    };
+    "winston-2.4.3" = {
+      name = "winston";
+      packageName = "winston";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz";
+        sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==";
+      };
+    };
+    "wordwrap-1.0.0" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+      };
+    };
+    "wordwrapjs-2.0.0" = {
+      name = "wordwrapjs";
+      packageName = "wordwrapjs";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-2.0.0.tgz";
+        sha1 = "ab55f695e6118da93858fdd70c053d1c5e01ac20";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+    "yallist-3.0.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
+        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+      };
+    };
+    "yauzl-2.4.1" = {
+      name = "yauzl";
+      packageName = "yauzl";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
+        sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
       };
     };
   };
   args = {
     name = "rhodecode-enterprise";
     packageName = "rhodecode-enterprise";
-    version = "0.0.1";
-    src = ./.;
+    version = "1.0.0";
+    src = ./..;
     dependencies = [
-      sources."grunt-0.4.5"
-      sources."grunt-contrib-copy-1.0.0"
-      (sources."grunt-contrib-concat-0.5.1" // {
+      sources."@types/clone-0.1.30"
+      sources."@types/node-4.2.23"
+      (sources."@types/parse5-0.0.31" // {
         dependencies = [
-          sources."chalk-0.5.1"
-          sources."ansi-styles-1.1.0"
-          sources."has-ansi-0.1.0"
-          sources."strip-ansi-0.3.0"
-          sources."supports-color-0.2.0"
-          sources."ansi-regex-0.2.1"
+          sources."@types/node-6.0.114"
+        ];
+      })
+      sources."abbrev-1.1.1"
+      sources."acorn-3.3.0"
+      sources."acorn-jsx-3.0.1"
+      sources."ajv-4.11.8"
+      sources."amdefine-1.0.1"
+      sources."ansi-escape-sequences-3.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."appenlight-client-git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      (sources."argparse-0.1.16" // {
+        dependencies = [
+          sources."underscore.string-2.4.0"
         ];
       })
-      sources."grunt-contrib-jshint-0.12.0"
-      (sources."grunt-contrib-less-1.4.1" // {
+      sources."array-back-1.0.4"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.3"
+      sources."assert-plus-0.2.0"
+      sources."async-0.1.22"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.7.0"
+      sources."babel-polyfill-6.26.0"
+      (sources."babel-runtime-6.26.0" // {
         dependencies = [
-          sources."async-2.5.0"
-          sources."lodash-4.17.4"
+          sources."regenerator-runtime-0.11.1"
         ];
       })
-      (sources."grunt-contrib-watch-0.6.1" // {
+      sources."balanced-match-1.0.0"
+      sources."base64-js-1.2.3"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."boom-2.10.1"
+      sources."bower-1.8.4"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.1"
+      sources."builtin-modules-1.1.1"
+      sources."builtins-1.0.3"
+      sources."caseless-0.12.0"
+      sources."chalk-1.1.3"
+      (sources."cli-1.0.1" // {
         dependencies = [
-          sources."lodash-2.4.2"
-          sources."async-0.2.10"
+          sources."glob-7.1.2"
+          sources."minimatch-3.0.4"
         ];
       })
+      sources."clipboard-2.0.1"
+      sources."clone-1.0.4"
+      sources."co-4.6.0"
+      sources."code-point-at-1.1.0"
+      sources."coffee-script-1.3.3"
+      sources."colors-0.6.2"
+      sources."combined-stream-1.0.6"
+      sources."command-line-args-3.0.5"
+      sources."command-line-usage-3.0.8"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."config-chain-1.1.11"
+      sources."console-browserify-1.1.0"
+      sources."console-control-strings-1.1.0"
+      sources."core-js-2.5.7"
+      sources."core-util-is-1.0.2"
       sources."crisper-2.1.1"
-      (sources."vulcanize-1.16.0" // {
+      sources."cryptiles-2.0.5"
+      sources."cycle-1.0.3"
+      (sources."dashdash-1.14.1" // {
         dependencies = [
-          sources."nopt-3.0.6"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."grunt-crisper-1.0.1"
-      (sources."grunt-vulcanize-1.0.0" // {
+      sources."date-now-0.1.4"
+      sources."dateformat-1.0.2-1.2.3"
+      sources."debug-0.7.4"
+      sources."deep-extend-0.4.2"
+      sources."deep-is-0.1.3"
+      sources."delayed-stream-1.0.0"
+      sources."delegate-3.2.0"
+      sources."delegates-1.0.0"
+      sources."doctrine-0.7.2"
+      (sources."dom-serializer-0.1.0" // {
         dependencies = [
-          sources."crisper-1.2.0"
-          sources."nopt-3.0.6"
+          sources."domelementtype-1.1.3"
+          sources."entities-1.1.1"
         ];
       })
-      sources."node2nix-1.3.0"
-      (sources."jshint-2.9.5" // {
+      sources."dom5-1.3.6"
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.3.0"
+      sources."domutils-1.5.1"
+      sources."ecc-jsbn-0.1.2"
+      sources."entities-1.0.0"
+      sources."errno-0.1.7"
+      sources."es6-promise-2.3.0"
+      sources."escape-string-regexp-1.0.5"
+      (sources."escodegen-1.11.0" // {
         dependencies = [
-          sources."minimatch-3.0.4"
-          sources."lodash-3.7.0"
+          sources."esprima-3.1.3"
+          sources."estraverse-4.2.0"
+          sources."esutils-2.0.2"
+          sources."source-map-0.6.1"
+        ];
+      })
+      (sources."espree-3.5.4" // {
+        dependencies = [
+          sources."acorn-5.7.1"
         ];
       })
-      sources."bower-1.8.2"
-      sources."jquery-1.11.3"
+      sources."esprima-1.0.4"
+      sources."estraverse-3.1.0"
+      sources."esutils-1.1.6"
+      sources."eventemitter2-0.4.14"
+      sources."exit-0.1.2"
+      sources."extend-3.0.2"
+      (sources."extract-zip-1.6.7" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."eyes-0.1.8"
+      sources."fast-levenshtein-2.0.6"
       sources."favico.js-0.3.10"
-      sources."clipboard-1.7.1"
-      sources."moment-2.18.1"
-      sources."mousetrap-1.6.1"
-      sources."appenlight-client-git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1"
-      sources."async-0.1.22"
-      sources."coffee-script-1.3.3"
-      sources."colors-0.6.2"
-      sources."dateformat-1.0.2-1.2.3"
-      sources."eventemitter2-0.4.14"
+      sources."faye-websocket-0.4.4"
+      sources."fd-slicer-1.0.1"
+      sources."feature-detect-es6-1.5.0"
+      sources."file-sync-cmp-0.1.1"
+      sources."find-replace-1.0.3"
+      sources."findit-2.0.0"
       (sources."findup-sync-0.1.3" // {
         dependencies = [
           sources."glob-3.2.11"
@@ -2686,333 +3062,321 b' let'
           sources."minimatch-0.3.0"
         ];
       })
+      sources."foreachasync-3.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      (sources."fs-extra-0.6.4" // {
+        dependencies = [
+          sources."mkdirp-0.3.5"
+        ];
+      })
+      (sources."fs.extra-1.3.2" // {
+        dependencies = [
+          sources."mkdirp-0.3.5"
+        ];
+      })
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
+      sources."gaze-0.5.2"
+      sources."getobject-0.1.0"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       (sources."glob-3.1.21" // {
         dependencies = [
           sources."inherits-1.0.2"
         ];
       })
-      sources."hooker-0.2.3"
-      sources."iconv-lite-0.2.11"
-      sources."minimatch-0.2.14"
-      sources."nopt-1.0.10"
-      sources."rimraf-2.2.8"
-      sources."lodash-0.9.2"
-      sources."underscore.string-2.2.1"
-      sources."which-1.0.9"
-      sources."js-yaml-2.0.5"
-      sources."exit-0.1.2"
-      sources."getobject-0.1.0"
-      sources."grunt-legacy-util-0.2.0"
+      (sources."globule-0.1.0" // {
+        dependencies = [
+          sources."lodash-1.0.2"
+        ];
+      })
+      sources."good-listener-1.2.2"
+      sources."graceful-fs-1.2.3"
+      sources."grunt-0.4.5"
+      (sources."grunt-contrib-concat-0.5.1" // {
+        dependencies = [
+          sources."ansi-regex-0.2.1"
+          sources."ansi-styles-1.1.0"
+          sources."chalk-0.5.1"
+          sources."has-ansi-0.1.0"
+          sources."strip-ansi-0.3.0"
+          sources."supports-color-0.2.0"
+        ];
+      })
+      sources."grunt-contrib-copy-1.0.0"
+      sources."grunt-contrib-jshint-0.12.0"
+      (sources."grunt-contrib-less-1.4.1" // {
+        dependencies = [
+          sources."async-2.6.1"
+          sources."lodash-4.17.10"
+        ];
+      })
+      (sources."grunt-contrib-watch-0.6.1" // {
+        dependencies = [
+          sources."async-0.2.10"
+          sources."lodash-2.4.2"
+        ];
+      })
+      sources."grunt-crisper-1.0.1"
       (sources."grunt-legacy-log-0.1.3" // {
         dependencies = [
           sources."lodash-2.4.2"
           sources."underscore.string-2.3.3"
         ];
       })
-      sources."inherits-2.0.3"
-      sources."lru-cache-2.7.3"
-      sources."sigmund-1.0.1"
-      sources."graceful-fs-1.2.3"
-      sources."abbrev-1.1.0"
-      (sources."argparse-0.1.16" // {
-        dependencies = [
-          sources."underscore.string-2.4.0"
-        ];
-      })
-      sources."esprima-1.0.4"
-      sources."underscore-1.7.0"
       (sources."grunt-legacy-log-utils-0.1.1" // {
         dependencies = [
           sources."lodash-2.4.2"
           sources."underscore.string-2.3.3"
         ];
       })
-      sources."chalk-1.1.3"
-      sources."file-sync-cmp-0.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
+      sources."grunt-legacy-util-0.2.0"
+      (sources."grunt-vulcanize-1.0.0" // {
+        dependencies = [
+          sources."crisper-1.2.0"
+          sources."nopt-3.0.6"
+        ];
+      })
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
       sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."source-map-0.3.0"
-      sources."amdefine-1.0.1"
-      (sources."less-2.7.2" // {
+      sources."has-unicode-2.0.1"
+      sources."hasha-2.2.0"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."hooker-0.2.3"
+      sources."hosted-git-info-2.7.1"
+      (sources."htmlparser2-3.8.3" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      sources."http-signature-1.1.1"
+      (sources."hydrolysis-1.25.0" // {
+        dependencies = [
+          sources."dom5-1.1.0"
+        ];
+      })
+      sources."iconv-lite-0.2.11"
+      sources."image-size-0.5.5"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."is-builtin-module-1.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-0.0.1"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jquery-1.11.3"
+      sources."js-yaml-2.0.5"
+      sources."jsbn-0.1.1"
+      (sources."jshint-2.9.6" // {
+        dependencies = [
+          sources."lodash-4.17.10"
+          sources."minimatch-3.0.4"
+        ];
+      })
+      sources."json-schema-0.2.3"
+      sources."json-stable-stringify-1.0.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-1.0.1"
+      sources."jsonify-0.0.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."kew-0.7.0"
+      (sources."klaw-1.3.1" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+        ];
+      })
+      (sources."less-2.7.3" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
           sources."source-map-0.5.7"
         ];
       })
-      sources."errno-0.1.4"
-      sources."image-size-0.5.5"
-      sources."mime-1.4.0"
-      sources."mkdirp-0.5.1"
-      sources."promise-7.3.1"
-      sources."request-2.82.0"
-      sources."prr-0.0.0"
+      sources."levn-0.3.0"
+      sources."lodash-0.9.2"
+      sources."lru-cache-2.7.3"
+      sources."mime-1.6.0"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimatch-0.2.14"
       sources."minimist-0.0.8"
-      sources."asap-2.0.6"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
-      sources."is-typedarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
-      sources."safe-buffer-5.1.1"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
-      sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
-      sources."core-util-is-1.0.2"
-      sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      sources."gaze-0.5.2"
-      (sources."tiny-lr-fork-0.0.5" // {
-        dependencies = [
-          sources."qs-0.5.6"
-        ];
-      })
-      (sources."globule-0.1.0" // {
-        dependencies = [
-          sources."lodash-1.0.2"
-        ];
-      })
-      sources."faye-websocket-0.4.4"
+      sources."minipass-2.3.3"
+      sources."minizlib-1.1.0"
+      sources."mkdirp-0.5.1"
+      sources."moment-2.22.2"
+      sources."mousetrap-1.6.2"
+      sources."ms-2.0.0"
+      sources."ncp-0.4.2"
+      sources."nijs-0.0.25"
+      sources."node2nix-1.6.0"
+      sources."nopt-1.0.10"
       (sources."noptify-0.0.3" // {
         dependencies = [
           sources."nopt-2.0.0"
         ];
       })
-      sources."debug-0.7.4"
-      sources."command-line-args-3.0.5"
-      sources."command-line-usage-3.0.8"
-      sources."dom5-1.3.6"
-      sources."array-back-1.0.4"
-      sources."feature-detect-es6-1.3.1"
-      sources."find-replace-1.0.3"
-      sources."typical-2.6.1"
-      sources."test-value-2.1.0"
-      sources."ansi-escape-sequences-3.0.0"
-      sources."table-layout-0.3.0"
-      sources."core-js-2.5.1"
-      sources."deep-extend-0.4.2"
-      sources."wordwrapjs-2.0.0"
-      sources."reduce-flatten-1.0.1"
-      sources."@types/clone-0.1.30"
-      sources."@types/node-4.2.20"
-      (sources."@types/parse5-0.0.31" // {
-        dependencies = [
-          sources."@types/node-6.0.88"
-        ];
-      })
-      sources."clone-1.0.2"
-      sources."parse5-1.5.1"
-      sources."es6-promise-2.3.0"
-      (sources."hydrolysis-1.25.0" // {
-        dependencies = [
-          sources."dom5-1.1.0"
-        ];
-      })
-      sources."path-posix-1.0.0"
-      sources."acorn-3.3.0"
-      sources."babel-polyfill-6.26.0"
-      sources."doctrine-0.7.2"
-      (sources."escodegen-1.9.0" // {
-        dependencies = [
-          sources."estraverse-4.2.0"
-          sources."esutils-2.0.2"
-          sources."esprima-3.1.3"
-          sources."source-map-0.5.7"
-        ];
-      })
-      (sources."espree-3.5.1" // {
-        dependencies = [
-          sources."acorn-5.1.2"
-        ];
-      })
-      sources."estraverse-3.1.0"
-      sources."path-is-absolute-1.0.1"
-      (sources."babel-runtime-6.26.0" // {
-        dependencies = [
-          sources."regenerator-runtime-0.11.0"
-        ];
-      })
-      sources."regenerator-runtime-0.10.5"
-      sources."esutils-1.1.6"
-      sources."isarray-0.0.1"
-      sources."optionator-0.8.2"
-      sources."prelude-ls-1.1.2"
-      sources."deep-is-0.1.3"
-      sources."wordwrap-1.0.0"
-      sources."type-check-0.3.2"
-      sources."levn-0.3.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."acorn-jsx-3.0.1"
-      sources."object-assign-4.1.1"
-      sources."optparse-1.0.5"
-      sources."semver-5.4.1"
-      (sources."npm-registry-client-8.4.0" // {
+      sources."normalize-package-data-2.4.0"
+      sources."npm-package-arg-6.1.0"
+      (sources."npm-registry-client-8.5.1" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
         ];
       })
-      (sources."npmconf-2.1.2" // {
+      (sources."npmconf-2.1.3" // {
         dependencies = [
           sources."nopt-3.0.6"
           sources."once-1.3.3"
           sources."semver-4.3.6"
         ];
       })
-      sources."tar-3.1.15"
-      sources."temp-0.8.3"
-      (sources."fs.extra-1.3.2" // {
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."optionator-0.8.2"
+      sources."optparse-1.0.5"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."parse5-1.5.1"
+      sources."path-is-absolute-1.0.1"
+      sources."path-posix-1.0.0"
+      sources."pend-1.2.0"
+      sources."performance-now-0.2.0"
+      sources."phantom-4.0.12"
+      (sources."phantomjs-prebuilt-2.1.16" // {
         dependencies = [
-          sources."mkdirp-0.3.5"
+          sources."es6-promise-4.2.4"
+          sources."fs-extra-1.0.0"
+          sources."graceful-fs-4.1.11"
+          sources."jsonfile-2.4.0"
+          sources."which-1.3.1"
         ];
       })
-      sources."findit-2.0.0"
-      sources."base64-js-1.2.1"
-      sources."slasp-0.0.4"
-      sources."nijs-0.0.23"
-      sources."concat-stream-1.6.0"
-      sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-5.1.2"
-      sources."once-1.4.0"
-      sources."retry-0.10.1"
-      sources."slide-1.1.6"
-      sources."ssri-4.1.6"
-      sources."npmlog-4.1.2"
-      sources."typedarray-0.0.6"
-      (sources."readable-stream-2.3.3" // {
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."prelude-ls-1.1.2"
+      sources."process-nextick-args-2.0.0"
+      sources."progress-1.1.8"
+      sources."promise-7.3.1"
+      sources."proto-list-1.2.4"
+      sources."prr-1.0.1"
+      sources."punycode-1.4.1"
+      sources."qrious-4.0.2"
+      sources."qs-6.4.0"
+      (sources."readable-stream-2.3.6" // {
         dependencies = [
           sources."isarray-1.0.0"
         ];
       })
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.3"
-      sources."util-deprecate-1.0.2"
-      sources."hosted-git-info-2.5.0"
-      sources."is-builtin-module-1.0.0"
-      sources."validate-npm-package-license-3.0.1"
-      sources."builtin-modules-1.1.1"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
-      sources."osenv-0.1.4"
-      sources."validate-npm-package-name-3.0.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."builtins-1.0.3"
-      sources."wrappy-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
+      sources."reduce-flatten-1.0.1"
+      sources."regenerator-runtime-0.10.5"
+      sources."request-2.81.0"
+      sources."request-progress-2.0.1"
+      sources."retry-0.10.1"
+      sources."rimraf-2.2.8"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."select-1.1.2"
+      sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
+      sources."shelljs-0.3.0"
+      sources."sigmund-1.0.1"
       sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."config-chain-1.1.11"
-      sources."ini-1.3.4"
-      sources."uid-number-0.0.5"
-      sources."proto-list-1.2.4"
-      sources."minipass-2.2.1"
-      sources."minizlib-1.0.3"
-      sources."yallist-3.0.2"
-      (sources."fs-extra-0.6.4" // {
+      sources."slasp-0.0.4"
+      sources."slide-1.1.6"
+      sources."sntp-1.0.9"
+      sources."source-map-0.3.0"
+      sources."spdx-correct-3.0.0"
+      sources."spdx-exceptions-2.1.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.0"
+      sources."split-1.0.1"
+      (sources."sshpk-1.14.2" // {
         dependencies = [
-          sources."mkdirp-0.3.5"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."walk-2.3.9"
-      sources."ncp-0.4.2"
-      sources."jsonfile-1.0.1"
-      sources."foreachasync-3.0.0"
-      (sources."cli-1.0.1" // {
+      sources."ssri-5.3.0"
+      sources."stack-trace-0.0.10"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."stringstream-0.0.6"
+      sources."strip-ansi-3.0.1"
+      sources."strip-json-comments-1.0.4"
+      sources."supports-color-2.0.0"
+      sources."table-layout-0.3.0"
+      sources."tar-3.1.15"
+      sources."temp-0.8.3"
+      sources."test-value-2.1.0"
+      sources."throttleit-1.0.0"
+      sources."through-2.3.8"
+      sources."tiny-emitter-2.0.2"
+      (sources."tiny-lr-fork-0.0.5" // {
         dependencies = [
-          sources."glob-7.1.2"
-          sources."minimatch-3.0.4"
-        ];
-      })
-      sources."console-browserify-1.1.0"
-      (sources."htmlparser2-3.8.3" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
+          sources."qs-0.5.6"
         ];
       })
-      sources."shelljs-0.3.0"
-      sources."strip-json-comments-1.0.4"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
-      sources."date-now-0.1.4"
-      sources."domhandler-2.3.0"
-      sources."domutils-1.5.1"
-      sources."domelementtype-1.3.0"
-      sources."entities-1.0.0"
-      (sources."dom-serializer-0.1.0" // {
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
+      sources."typedarray-0.0.6"
+      sources."typical-2.6.1"
+      sources."uid-number-0.0.5"
+      sources."underscore-1.7.0"
+      sources."underscore.string-2.2.1"
+      sources."unicode-5.2.0-0.7.5"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."validate-npm-package-license-3.0.3"
+      sources."validate-npm-package-name-3.0.0"
+      (sources."verror-1.10.0" // {
         dependencies = [
-          sources."domelementtype-1.1.3"
-          sources."entities-1.1.1"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."good-listener-1.2.2"
-      sources."select-1.1.2"
-      sources."tiny-emitter-2.0.2"
-      sources."delegate-3.1.3"
+      (sources."vulcanize-1.16.0" // {
+        dependencies = [
+          sources."nopt-3.0.6"
+        ];
+      })
+      sources."walk-2.3.14"
+      sources."which-1.0.9"
+      sources."wide-align-1.1.3"
+      (sources."winston-2.4.3" // {
+        dependencies = [
+          sources."async-1.0.0"
+          sources."colors-1.0.3"
+        ];
+      })
+      sources."wordwrap-1.0.0"
+      sources."wordwrapjs-2.0.0"
+      sources."wrappy-1.0.2"
+      sources."yallist-3.0.2"
+      sources."yauzl-2.4.1"
     ];
+    buildInputs = globalBuildInputs;
     meta = {
+      description = "RhodeCode JS packaged";
+      license = "SEE LICENSE IN LICENSE.txt";
     };
     production = false;
+    bypassCache = false;
   };
 in
 {

pkgs/python-packages-overrides.nix

@@ -4,10 +4,13 b''
 # python-packages.nix. The main objective is to add needed dependencies of C
 # libraries and tweak the build instructions where needed.
 
-{ pkgs, basePythonPackages }:
+{ pkgs
+, basePythonPackages
+}:
 
 let
   sed = "sed -i";
+
   localLicenses = {
     repoze = {
       fullName = "Repoze License";
@@ -19,32 +22,41 b' in'
 
 self: super: {
 
-  appenlight-client = super.appenlight-client.override (attrs: {
+  "appenlight-client" = super."appenlight-client".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   });
 
-  Beaker = super.Beaker.override (attrs: {
+  "beaker" = super."beaker".override (attrs: {
     patches = [
-      ./patch-beaker-lock-func-debug.diff
+      ./patch_beaker/patch-beaker-lock-func-debug.diff
+      ./patch_beaker/patch-beaker-metadata-reuse.diff
     ];
   });
 
-  future = super.future.override (attrs: {
+  "gevent" = super."gevent".override (attrs: {
+    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      # NOTE: (marcink) odd requirements from gevent aren't set properly,
+      # thus we need to inject psutil manually
+      self."psutil"
+    ];
+  });
+
+  "future" = super."future".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   });
 
-  testpath = super.testpath.override (attrs: {
+  "testpath" = super."testpath".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   });
 
-  gnureadline = super.gnureadline.override (attrs: {
-    buildInputs = attrs.buildInputs ++ [
+  "gnureadline" = super."gnureadline".override (attrs: {
+    buildInputs = [
       pkgs.ncurses
     ];
     patchPhase = ''
@@ -52,56 +64,50 b' self: super: {'
     '';
   });
 
-  gunicorn = super.gunicorn.override (attrs: {
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+  "gunicorn" = super."gunicorn".override (attrs: {
+    propagatedBuildInputs = [
       # johbo: futures is needed as long as we are on Python 2, otherwise
       # gunicorn explodes if used with multiple threads per worker.
-      self.futures
+      self."futures"
     ];
   });
 
-  nbconvert = super.nbconvert.override (attrs: {
+ "nbconvert" = super."nbconvert".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # marcink: plug in jupyter-client for notebook rendering
-      self.jupyter-client
+      self."jupyter-client"
     ];
   });
 
-  ipython = super.ipython.override (attrs: {
+  "ipython" = super."ipython".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
-      self.gnureadline
+      self."gnureadline"
     ];
   });
 
-  lxml = super.lxml.override (attrs: {
-    # johbo: On 16.09 we need this to compile on darwin, otherwise compilation
-    # fails on Darwin.
-    hardeningDisable = if pkgs.stdenv.isDarwin then [ "format" ] else null;
-    buildInputs = with self; [
+  "lxml" = super."lxml".override (attrs: {
+    buildInputs = [
       pkgs.libxml2
       pkgs.libxslt
     ];
+    propagatedBuildInputs = [
+      # Needed, so that "setup.py bdist_wheel" does work
+      self."wheel"
+    ];
   });
 
-  MySQL-python = super.MySQL-python.override (attrs: {
-    buildInputs = attrs.buildInputs ++ [
+  "mysql-python" = super."mysql-python".override (attrs: {
+    buildInputs = [
       pkgs.openssl
     ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+    propagatedBuildInputs = [
       pkgs.libmysql
       pkgs.zlib
     ];
   });
 
-  psutil = super.psutil.override (attrs: {
-    buildInputs = attrs.buildInputs ++
-      pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.IOKit;
-  });
-
-  psycopg2 = super.psycopg2.override (attrs: {
-    buildInputs = attrs.buildInputs ++
-      pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.openssl;
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+  "psycopg2" = super."psycopg2".override (attrs: {
+    propagatedBuildInputs = [
       pkgs.postgresql
     ];
     meta = {
@@ -109,8 +115,8 b' self: super: {'
     };
   });
 
-  pycurl = super.pycurl.override (attrs: {
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+  "pycurl" = super."pycurl".override (attrs: {
+    propagatedBuildInputs = [
       pkgs.curl
       pkgs.openssl
     ];
@@ -119,30 +125,23 b' self: super: {'
       export PYCURL_SSL_LIBRARY=openssl
     '';
     meta = {
-      # TODO: It is LGPL and MIT
       license = pkgs.lib.licenses.mit;
     };
   });
 
-  pyramid = super.pyramid.override (attrs: {
-    postFixup = ''
-      wrapPythonPrograms
-      # TODO: johbo: "wrapPython" adds this magic line which
-      # confuses pserve.
-      ${sed} '/import sys; sys.argv/d' $out/bin/.pserve-wrapped
-    '';
+  "pyramid" = super."pyramid".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  pyramid-debugtoolbar = super.pyramid-debugtoolbar.override (attrs: {
+  "pyramid-debugtoolbar" = super."pyramid-debugtoolbar".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal localLicenses.repoze ];
     };
   });
 
-  pysqlite = super.pysqlite.override (attrs: {
+  "pysqlite" = super."pysqlite".override (attrs: {
     propagatedBuildInputs = [
       pkgs.sqlite
     ];
@@ -151,41 +150,39 b' self: super: {'
     };
   });
 
-  pytest-runner = super.pytest-runner.override (attrs: {
+  "pytest-runner" = super."pytest-runner".override (attrs: {
     propagatedBuildInputs = [
-      self.setuptools-scm
+      self."setuptools-scm"
+    ];
+  });
+
+  "python-ldap" = super."python-ldap".override (attrs: {
+    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      pkgs.openldap
+      pkgs.cyrus_sasl
+      pkgs.openssl
     ];
   });
 
-  python-ldap = super.python-ldap.override (attrs: {
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
-      pkgs.cyrus_sasl
-      pkgs.openldap
-      pkgs.openssl
+  "python-pam" = super."python-pam".override (attrs: {
+    propagatedBuildInputs = [
+        pkgs.pam
     ];
-    # TODO: johbo: Remove the "or" once we drop 16.03 support.
-    NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev or pkgs.cyrus_sasl}/include/sasl";
+    # TODO: johbo: Check if this can be avoided, or transform into
+    # a real patch
+    patchPhase = ''
+      substituteInPlace pam.py \
+        --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
+    '';
+    });
+
+  "pyzmq" = super."pyzmq".override (attrs: {
+    buildInputs = [
+      pkgs.czmq
+    ];
   });
 
-  python-pam = super.python-pam.override (attrs:
-    let
-      includeLibPam = pkgs.stdenv.isLinux;
-    in {
-      # TODO: johbo: Move the option up into the default.nix, we should
-      # include python-pam only on supported platforms.
-      propagatedBuildInputs = attrs.propagatedBuildInputs ++
-        pkgs.lib.optional includeLibPam [
-          pkgs.pam
-        ];
-      # TODO: johbo: Check if this can be avoided, or transform into
-      # a real patch
-      patchPhase = pkgs.lib.optionals includeLibPam ''
-        substituteInPlace pam.py \
-          --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
-      '';
-    });
-
-  URLObject = super.URLObject.override (attrs: {
+  "urlobject" = super."urlobject".override (attrs: {
     meta = {
       license = {
         spdxId = "Unlicense";
@@ -195,56 +192,56 b' self: super: {'
     };
   });
 
-  docutils = super.docutils.override (attrs: {
+  "docutils" = super."docutils".override (attrs: {
     meta = {
       license = pkgs.lib.licenses.bsd2;
     };
   });
 
-  colander = super.colander.override (attrs: {
+  "colander" = super."colander".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  pyramid-beaker  = super.pyramid-beaker.override (attrs: {
+  "pyramid-beaker"  = super."pyramid-beaker".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  pyramid-mako = super.pyramid-mako.override (attrs: {
+  "pyramid-mako" = super."pyramid-mako".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  repoze.lru = super.repoze.lru.override (attrs: {
+  "repoze.lru" = super."repoze.lru".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  python-editor = super.python-editor.override (attrs: {
+  "python-editor" = super."python-editor".override (attrs: {
     meta = {
       license = pkgs.lib.licenses.asl20;
     };
   });
 
-  translationstring = super.translationstring.override (attrs: {
+  "translationstring" = super."translationstring".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  venusian = super.venusian.override (attrs: {
+  "venusian" = super."venusian".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  # Avoid that setuptools is replaced, this leads to trouble
-  # with buildPythonPackage.
-  setuptools = basePythonPackages.setuptools;
+  # Avoid that base packages screw up the build process
+  inherit (basePythonPackages)
+    setuptools;
 
 }

pkgs/python-packages.nix

@@ -1,2082 +1,2276 b''
-# Generated by pip2nix 0.4.0
+# Generated by pip2nix 0.8.0.dev1
 # See https://github.com/johbo/pip2nix
 
-{
-  Babel = super.buildPythonPackage {
-    name = "Babel-1.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [pytz];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/33/27/e3978243a03a76398c384c83f7ca879bc6e8f1511233a621fcada135606e/Babel-1.3.tar.gz";
-      md5 = "5264ceb02717843cbc9ffce8e6e06bdb";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  Beaker = super.buildPythonPackage {
-    name = "Beaker-1.9.1";
-    buildInputs = with self; [];
+{ pkgs, fetchurl, fetchgit, fetchhg }:
+
+self: super: {
+  "alembic" = super.buildPythonPackage {
+    name = "alembic-0.9.9";
     doCheck = false;
-    propagatedBuildInputs = with self; [funcsigs];
+    propagatedBuildInputs = [
+      self."sqlalchemy"
+      self."mako"
+      self."python-editor"
+      self."python-dateutil"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz";
-      md5 = "46fda0a164e2b0d24ccbda51a2310301";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  CProfileV = super.buildPythonPackage {
-    name = "CProfileV-1.0.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [bottle];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/df/50/d8c1ada7d537c64b0f76453fa31dedb6af6e27b82fcf0331e5f71a4cf98b/CProfileV-1.0.7.tar.gz";
-      md5 = "db4c7640438aa3d8887e194c81c7a019";
+      url = "https://files.pythonhosted.org/packages/89/03/756d5b8e1c90bf283c3f435766aa3f20208d1c3887579dd8f2122e01d5f4/alembic-0.9.9.tar.gz";
+      sha256 = "0bmkq6isjbmy4p7nxfvfpknjsx7rb3xn9g00169y891hcfkkxgc5";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Chameleon = super.buildPythonPackage {
-    name = "Chameleon-2.24";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/5a/9e/637379ffa13c5172b5c0e704833ffea6bf51cec7567f93fd6e903d53ed74/Chameleon-2.24.tar.gz";
-      md5 = "1b01f1f6533a8a11d0d2f2366dec5342";
-    };
-    meta = {
-      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
-    };
-  };
-  FormEncode = super.buildPythonPackage {
-    name = "FormEncode-1.2.4";
-    buildInputs = with self; [];
+  "amqp" = super.buildPythonPackage {
+    name = "amqp-2.3.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."vine"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8e/59/0174271a6f004512e0201188593e6d319db139d14cb7490e488bbb078015/FormEncode-1.2.4.tar.gz";
-      md5 = "6bc17fb9aed8aea198975e888e2077f4";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.psfl ];
-    };
-  };
-  Jinja2 = super.buildPythonPackage {
-    name = "Jinja2-2.9.6";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [MarkupSafe];
-    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/1b/32/242ff76cd802766f11c89c72f3389b5c8de4bdfbab406137b90c5fae8b05/amqp-2.3.1.tar.gz";
+      sha256 = "0wlfnvhmfrn7c8qif2jyvsm63ibdxp02ss564qwrvqfhz0di72s0";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  Mako = super.buildPythonPackage {
-    name = "Mako-1.0.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [MarkupSafe];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-1.0.7.tar.gz";
-      md5 = "5836cc997b1b773ef389bf6629c30e65";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  Markdown = super.buildPythonPackage {
-    name = "Markdown-2.6.11";
-    buildInputs = with self; [];
+  "appenlight-client" = super.buildPythonPackage {
+    name = "appenlight-client-0.6.25";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."webob"
+      self."requests"
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b3/73/fc5c850f44af5889192dff783b7b0d8f3fe8d30b65c8e3f78f8f0265fecf/Markdown-2.6.11.tar.gz";
-      md5 = "a67c1b2914f7d74eeede2ebe0fdae470";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  MarkupSafe = super.buildPythonPackage {
-    name = "MarkupSafe-1.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
-      md5 = "2fcedc9284d50e577b5192e8e3578355";
+      url = "https://files.pythonhosted.org/packages/fa/44/2911ef85ea4f4fe65058fd22959d8dad598fab6a3c84e5bcb569d15c8783/appenlight_client-0.6.25.tar.gz";
+      sha256 = "1r9l2rfg677nxhamdbyb9y4fs1zgy2dy1p19c68fnvqkxz40y627";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  MySQL-python = super.buildPythonPackage {
-    name = "MySQL-python-1.2.5";
-    buildInputs = with self; [];
+  "atomicwrites" = super.buildPythonPackage {
+    name = "atomicwrites-1.1.5";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a5/e9/51b544da85a36a68debe7a7091f068d802fc515a3a202652828c73453cad/MySQL-python-1.2.5.zip";
-      md5 = "654f75b302db6ed8dc5a898c625e030c";
+      url = "https://files.pythonhosted.org/packages/a1/e1/2d9bc76838e6e6667fde5814aa25d7feb93d6fa471bf6816daac2596e8b2/atomicwrites-1.1.5.tar.gz";
+      sha256 = "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214";
     };
     meta = {
-      license = [ pkgs.lib.licenses.gpl1 ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Paste = super.buildPythonPackage {
-    name = "Paste-2.0.3";
-    buildInputs = with self; [];
+  "attrs" = super.buildPythonPackage {
+    name = "attrs-18.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/30/c3/5c2f7c7a02e4f58d4454353fa1c32c94f79fa4e36d07a67c0ac295ea369e/Paste-2.0.3.tar.gz";
-      md5 = "1231e14eae62fa7ed76e9130b04bc61e";
+      url = "https://files.pythonhosted.org/packages/e4/ac/a04671e118b57bee87dabca1e0f2d3bda816b7a551036012d0ca24190e71/attrs-18.1.0.tar.gz";
+      sha256 = "0yzqz8wv3w1srav5683a55v49i0szkm47dyrnkd56fqs8j8ypl70";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  PasteDeploy = super.buildPythonPackage {
-    name = "PasteDeploy-1.5.2";
-    buildInputs = with self; [];
+  "authomatic" = super.buildPythonPackage {
+    name = "authomatic-0.1.0.post1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
-      md5 = "352b7205c78c8de4987578d19431af3b";
+      url = "https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801";
+      sha256 = "1cgk0a86sbsjbri06gf5z5l4npwkjdxw6fdnwl4vvfmxs2sx9yxw";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  PasteScript = super.buildPythonPackage {
-    name = "PasteScript-2.0.2";
-    buildInputs = with self; [];
+  "babel" = super.buildPythonPackage {
+    name = "babel-1.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [Paste PasteDeploy six];
+    propagatedBuildInputs = [
+      self."pytz"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e5/f0/78e766c3dcc61a4f3a6f71dd8c95168ae9c7a31722b5663d19c1fdf62cb6/PasteScript-2.0.2.tar.gz";
-      md5 = "ccb3045445097192ca71a13b746c77b2";
+      url = "https://files.pythonhosted.org/packages/33/27/e3978243a03a76398c384c83f7ca879bc6e8f1511233a621fcada135606e/Babel-1.3.tar.gz";
+      sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "backports.shutil-get-terminal-size" = super.buildPythonPackage {
+    name = "backports.shutil-get-terminal-size-1.0.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz";
+      sha256 = "107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Pygments = super.buildPythonPackage {
-    name = "Pygments-2.2.0";
-    buildInputs = with self; [];
+  "beaker" = super.buildPythonPackage {
+    name = "beaker-1.9.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."funcsigs"
+    ];
     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/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz";
+      sha256 = "08arsn61r255lhz6hcpn2lsiqpg30clla805ysx06wmbhvb6w9rj";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  Routes = super.buildPythonPackage {
-    name = "Routes-2.4.1";
-    buildInputs = with self; [];
+  "beautifulsoup4" = super.buildPythonPackage {
+    name = "beautifulsoup4-4.6.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [six repoze.lru];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/33/38/ea827837e68d9c7dde4cff7ec122a93c319f0effc08ce92a17095576603f/Routes-2.4.1.tar.gz";
-      md5 = "c058dff6832941dec47e0d0052548ad8";
+      url = "https://files.pythonhosted.org/packages/88/df/86bffad6309f74f3ff85ea69344a078fc30003270c8df6894fca7a3c72ff/beautifulsoup4-4.6.3.tar.gz";
+      sha256 = "041dhalzjciw6qyzzq7a2k4h1yvyk76xigp35hv5ibnn448ydy4h";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  SQLAlchemy = super.buildPythonPackage {
-    name = "SQLAlchemy-1.1.15";
-    buildInputs = with self; [];
+  "billiard" = super.buildPythonPackage {
+    name = "billiard-3.5.0.3";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/39/ac/f5571210cca2e4f4532e38aaff242f26c8654c5e2436bee966c230647ccc/billiard-3.5.0.3.tar.gz";
+      sha256 = "1riwiiwgb141151md4ykx49qrz749akj5k8g290ji9bsqjyj4yqx";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "bleach" = super.buildPythonPackage {
+    name = "bleach-2.1.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."html5lib"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c2/f6/11fcc1ce19a7cb81b1c9377f4e27ce3813265611922e355905e57c44d164/SQLAlchemy-1.1.15.tar.gz";
-      md5 = "077f9bd3339957f53068b5572a152674";
+      url = "https://files.pythonhosted.org/packages/7a/b7/fa555afb61462b030abaf9ed1479b8ea031510f58c7706b06113be9f82ea/bleach-2.1.4.tar.gz";
+      sha256 = "1n337zbdml6z6zia0b1qgv6xiddx3qlwmcg9vk2mk60jcxhmzs8f";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "bottle" = super.buildPythonPackage {
+    name = "bottle-0.12.13";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz";
+      sha256 = "0m9k2a7yxvggc4kw8fsvj381vgsvfcdshg5nzy6vwrxiw2p53drr";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Tempita = super.buildPythonPackage {
-    name = "Tempita-0.5.2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/56/c8/8ed6eee83dbddf7b0fc64dd5d4454bc05e6ccaafff47991f73f2894d9ff4/Tempita-0.5.2.tar.gz";
-      md5 = "4c2f17bb9d481821c41b6fbee904cea1";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  URLObject = super.buildPythonPackage {
-    name = "URLObject-2.4.0";
-    buildInputs = with self; [];
+  "bumpversion" = super.buildPythonPackage {
+    name = "bumpversion-0.5.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cb/b6/e25e58500f9caef85d664bec71ec67c116897bfebf8622c32cb75d1ca199/URLObject-2.4.0.tar.gz";
-      md5 = "2ed819738a9f0a3051f31dc9924e3065";
-    };
-    meta = {
-      license = [  ];
-    };
-  };
-  WebError = super.buildPythonPackage {
-    name = "WebError-0.10.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [WebOb Tempita Pygments Paste];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/35/76/e7e5c2ce7e9c7f31b54c1ff295a495886d1279a002557d74dd8957346a79/WebError-0.10.3.tar.gz";
-      md5 = "84b9990b0baae6fd440b1e60cdd06f9a";
+      url = "https://files.pythonhosted.org/packages/14/41/8c9da3549f8e00c84f0432c3a8cf8ed6898374714676aab91501d48760db/bumpversion-0.5.3.tar.gz";
+      sha256 = "0zn7694yfipxg35ikkfh7kvgl2fissha3dnqad2c5bvsvmrwhi37";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  WebHelpers = super.buildPythonPackage {
-    name = "WebHelpers-1.3";
-    buildInputs = with self; [];
+  "celery" = super.buildPythonPackage {
+    name = "celery-4.1.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pytz"
+      self."billiard"
+      self."kombu"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/e9/cf/a4c0597effca20c57eb586324e41d1180bc8f13a933da41e0646cff69f02/celery-4.1.1.tar.gz";
+      sha256 = "1xbir4vw42n2ir9lanhwl7w69zpmj7lbi66fxm2b7pyvkcss7wni";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "chameleon" = super.buildPythonPackage {
+    name = "chameleon-2.24";
     doCheck = false;
-    propagatedBuildInputs = with self; [MarkupSafe];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ee/68/4d07672821d514184357f1552f2dad923324f597e722de3b016ca4f7844f/WebHelpers-1.3.tar.gz";
-      md5 = "32749ffadfc40fea51075a7def32588b";
+      url = "https://files.pythonhosted.org/packages/5a/9e/637379ffa13c5172b5c0e704833ffea6bf51cec7567f93fd6e903d53ed74/Chameleon-2.24.tar.gz";
+      sha256 = "0ykqr7syxfa6h9adjfnsv1gdsca2xzm22vmic8859n0f0j09abj5";
+    };
+    meta = {
+      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+    };
+  };
+  "channelstream" = super.buildPythonPackage {
+    name = "channelstream-0.5.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."gevent"
+      self."ws4py"
+      self."pyramid"
+      self."pyramid-jinja2"
+      self."itsdangerous"
+      self."requests"
+      self."six"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/2b/31/29a8e085cf5bf97fa88e7b947adabfc581a18a3463adf77fb6dada34a65f/channelstream-0.5.2.tar.gz";
+      sha256 = "1qbm4xdl5hfkja683x546bncg3rqq8qv79w1m1a1wd48cqqzb6rm";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  WebHelpers2 = super.buildPythonPackage {
-    name = "WebHelpers2-2.0";
-    buildInputs = with self; [];
+  "click" = super.buildPythonPackage {
+    name = "click-6.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [MarkupSafe six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ff/30/56342c6ea522439e3662427c8d7b5e5b390dff4ff2dc92d8afcb8ab68b75/WebHelpers2-2.0.tar.gz";
-      md5 = "0f6b68d70c12ee0aed48c00b24da13d3";
+      url = "https://files.pythonhosted.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
+      sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  WebOb = super.buildPythonPackage {
-    name = "WebOb-1.7.4";
-    buildInputs = with self; [];
+  "colander" = super.buildPythonPackage {
+    name = "colander-1.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."translationstring"
+      self."iso8601"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/75/34/731e23f52371852dfe7490a61644826ba7fe70fd52a377aaca0f4956ba7f/WebOb-1.7.4.tar.gz";
-      md5 = "397e46892d7f199b1a07eb20a2d3d9bd";
+      url = "https://files.pythonhosted.org/packages/cc/e2/c4e716ac4a426d8ad4dfe306c34f0018a22275d2420815784005bf771c84/colander-1.4.tar.gz";
+      sha256 = "0wjfphyr5aakv5hw73q287lbc15cbm0aardajv7i2mqf377rl3p2";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  WebTest = super.buildPythonPackage {
-    name = "WebTest-2.0.29";
-    buildInputs = with self; [];
+  "configobj" = super.buildPythonPackage {
+    name = "configobj-5.0.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [six WebOb waitress beautifulsoup4];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz";
-      md5 = "30b4cf0d340b9a5335fac4389e6f84fc";
+      url = "https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c";
+      sha256 = "1hhcxirwvg58grlfr177b3awhbq8hlx1l3lh69ifl1ki7lfd1s1x";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "configparser" = super.buildPythonPackage {
+    name = "configparser-3.5.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz";
+      sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Whoosh = super.buildPythonPackage {
-    name = "Whoosh-2.7.4";
-    buildInputs = with self; [];
+  "cov-core" = super.buildPythonPackage {
+    name = "cov-core-1.15.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."coverage"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/Whoosh-2.7.4.tar.gz";
-      md5 = "c2710105f20b3e29936bd2357383c325";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.bsd2 ];
-    };
-  };
-  alembic = super.buildPythonPackage {
-    name = "alembic-0.9.8";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [SQLAlchemy Mako python-editor python-dateutil];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/a1/95/2252783859df9ec76b9a25d968c2827ed75a43ba34c6e8d38f87a5c0fb26/alembic-0.9.8.tar.gz";
-      md5 = "5cfef58641c9a94d4a5d547e951a7dda";
+      url = "https://files.pythonhosted.org/packages/4b/87/13e75a47b4ba1be06f29f6d807ca99638bedc6b57fa491cd3de891ca2923/cov-core-1.15.0.tar.gz";
+      sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  amqp = super.buildPythonPackage {
-    name = "amqp-2.2.2";
-    buildInputs = with self; [];
+  "coverage" = super.buildPythonPackage {
+    name = "coverage-3.7.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [vine];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e0/70/9ab9ccd8247fb7d2adb717e9f6a0ed358c9e1ab2c349048b0352f9e80ee2/amqp-2.2.2.tar.gz";
-      md5 = "0971a3fd2d635ded45c349cfc17106bd";
+      url = "https://files.pythonhosted.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
+      sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  appenlight-client = super.buildPythonPackage {
-    name = "appenlight-client-0.6.25";
-    buildInputs = with self; [];
+  "cprofilev" = super.buildPythonPackage {
+    name = "cprofilev-1.0.7";
     doCheck = false;
-    propagatedBuildInputs = with self; [WebOb requests six];
+    propagatedBuildInputs = [
+      self."bottle"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/44/2911ef85ea4f4fe65058fd22959d8dad598fab6a3c84e5bcb569d15c8783/appenlight_client-0.6.25.tar.gz";
-      md5 = "76dd2f9d42659fae8f290982078dc880";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  authomatic = super.buildPythonPackage {
-    name = "authomatic-0.1.0.post1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801";
-      md5 = "3c68720a1322b25254009518d1ff6801";
+      url = "https://files.pythonhosted.org/packages/df/50/d8c1ada7d537c64b0f76453fa31dedb6af6e27b82fcf0331e5f71a4cf98b/CProfileV-1.0.7.tar.gz";
+      sha256 = "0xwszfhxgndpcjkpq89dix6vi02hj1gzvhr7r716hd1x3y5p94c7";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  backports.shutil-get-terminal-size = super.buildPythonPackage {
-    name = "backports.shutil-get-terminal-size-1.0.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz";
-      md5 = "03267762480bd86b50580dc19dff3c66";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  beautifulsoup4 = super.buildPythonPackage {
-    name = "beautifulsoup4-4.6.0";
-    buildInputs = with self; [];
+  "cssselect" = super.buildPythonPackage {
+    name = "cssselect-1.0.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/8d/1d14391fdaed5abada4e0f63543fef49b8331a34ca60c88bd521bcf7f782/beautifulsoup4-4.6.0.tar.gz";
-      md5 = "c17714d0f91a23b708a592cb3c697728";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  billiard = super.buildPythonPackage {
-    name = "billiard-3.5.0.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/39/ac/f5571210cca2e4f4532e38aaff242f26c8654c5e2436bee966c230647ccc/billiard-3.5.0.3.tar.gz";
-      md5 = "113ba481e48400adbf6fbbf59a2f8554";
+      url = "https://files.pythonhosted.org/packages/52/ea/f31e1d2e9eb130fda2a631e22eac369dc644e8807345fbed5113f2d6f92b/cssselect-1.0.3.tar.gz";
+      sha256 = "011jqa2jhmydhi0iz4v1w3cr540z5zas8g2bw8brdw4s4b2qnv86";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  bleach = super.buildPythonPackage {
-    name = "bleach-2.1.2";
-    buildInputs = with self; [];
+  "decorator" = super.buildPythonPackage {
+    name = "decorator-4.1.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [six html5lib];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b3/5f/0da670d30d3ffbc57cc97fa82947f81bbe3eab8d441e2d42e661f215baf2/bleach-2.1.2.tar.gz";
-      md5 = "d0b14ae43a437ee0c650e04c6063eedd";
+      url = "https://files.pythonhosted.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
+      sha256 = "1d8npb11kxyi36mrvjdpcjij76l5zfyrz2f820brf0l0rcw4vdkw";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
+    };
+  };
+  "deform" = super.buildPythonPackage {
+    name = "deform-2.0.5";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."chameleon"
+      self."colander"
+      self."iso8601"
+      self."peppercorn"
+      self."translationstring"
+      self."zope.deprecation"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/0c/b1/ba711d5808c12538c8504f534d79c124ed834f19ac36f0ac5391c3bbd1c1/deform-2.0.5.tar.gz";
+      sha256 = "0ybg9zsnfac1kaxrjanmkjk0xaklf4d3piywxwr08l1cl1336kc7";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
+  "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";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
     };
   };
-  bottle = super.buildPythonPackage {
-    name = "bottle-0.12.13";
-    buildInputs = with self; [];
+  "dogpile.cache" = super.buildPythonPackage {
+    name = "dogpile.cache-0.6.6";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/48/ca/604154d835c3668efb8a31bd979b0ea4bf39c2934a40ffecc0662296cb51/dogpile.cache-0.6.6.tar.gz";
+      sha256 = "1h8n1lxd4l2qvahfkiinljkqz7pww7w3sgag0j8j9ixbl2h4wk84";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "dogpile.core" = super.buildPythonPackage {
+    name = "dogpile.core-0.4.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz";
-      md5 = "d2fe1b48c1d49217e78bf326b1cad437";
+      url = "https://files.pythonhosted.org/packages/0e/77/e72abc04c22aedf874301861e5c1e761231c288b5de369c18be8f4b5c9bb/dogpile.core-0.4.1.tar.gz";
+      sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "ecdsa" = super.buildPythonPackage {
+    name = "ecdsa-0.13";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/f9/e5/99ebb176e47f150ac115ffeda5fedb6a3dbb3c00c74a59fd84ddf12f5857/ecdsa-0.13.tar.gz";
+      sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  bumpversion = super.buildPythonPackage {
-    name = "bumpversion-0.5.3";
-    buildInputs = with self; [];
+  "elasticsearch" = super.buildPythonPackage {
+    name = "elasticsearch-2.3.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."urllib3"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/35/5fd52c5f0b0ee405ed4b5195e8bce44c5e041787680dc7b94b8071cac600/elasticsearch-2.3.0.tar.gz";
+      sha256 = "10ad2dk73xsys9vajwsncibs69asa63w1hgwz6lz1prjpyi80c5y";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "elasticsearch-dsl" = super.buildPythonPackage {
+    name = "elasticsearch-dsl-2.2.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."python-dateutil"
+      self."elasticsearch"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/14/41/8c9da3549f8e00c84f0432c3a8cf8ed6898374714676aab91501d48760db/bumpversion-0.5.3.tar.gz";
-      md5 = "c66a3492eafcf5ad4b024be9fca29820";
+      url = "https://files.pythonhosted.org/packages/66/2f/52a086968788e58461641570f45c3207a52d46ebbe9b77dc22b6a8ffda66/elasticsearch-dsl-2.2.0.tar.gz";
+      sha256 = "1g4kxzxsdwlsl2a9kscmx11pafgimhj7y8wrfksv8pgvpkfb9fwr";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "entrypoints" = super.buildPythonPackage {
+    name = "entrypoints-0.2.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."configparser"
+    ];
+    src = fetchurl {
+      url = "https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313";
+      sha256 = "0bihrdp8ahsys437kxdhk52gz6kib8rxjv71i93wkw7594fcaxll";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  celery = super.buildPythonPackage {
-    name = "celery-4.1.0";
-    buildInputs = with self; [];
+  "enum34" = super.buildPythonPackage {
+    name = "enum34-1.1.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [pytz billiard kombu];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/07/65/88a2a45fc80f487872c93121a701a53bbbc3d3d832016876fac84fc8d46a/celery-4.1.0.tar.gz";
-      md5 = "db91e1d26936381127f01e150fe3054a";
+      url = "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz";
+      sha256 = "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  channelstream = super.buildPythonPackage {
-    name = "channelstream-0.5.2";
-    buildInputs = with self; [];
+  "formencode" = super.buildPythonPackage {
+    name = "formencode-1.2.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [gevent ws4py pyramid pyramid-jinja2 itsdangerous requests six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2b/31/29a8e085cf5bf97fa88e7b947adabfc581a18a3463adf77fb6dada34a65f/channelstream-0.5.2.tar.gz";
-      md5 = "1c5eb2a8a405be6f1073da94da6d81d3";
+      url = "https://files.pythonhosted.org/packages/8e/59/0174271a6f004512e0201188593e6d319db139d14cb7490e488bbb078015/FormEncode-1.2.4.tar.gz";
+      sha256 = "1fgy04sdy4yry5xcjls3x3xy30dqwj58ycnkndim819jx0788w42";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  click = super.buildPythonPackage {
-    name = "click-6.6";
-    buildInputs = with self; [];
+  "funcsigs" = super.buildPythonPackage {
+    name = "funcsigs-1.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
-      md5 = "d0b09582123605220ad6977175f3e51d";
+      url = "https://files.pythonhosted.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz";
+      sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ { fullName = "ASL"; } pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "functools32" = super.buildPythonPackage {
+    name = "functools32-3.2.3.post2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz";
+      sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  colander = super.buildPythonPackage {
-    name = "colander-1.4";
-    buildInputs = with self; [];
+  "future" = super.buildPythonPackage {
+    name = "future-0.14.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [translationstring iso8601];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cc/e2/c4e716ac4a426d8ad4dfe306c34f0018a22275d2420815784005bf771c84/colander-1.4.tar.gz";
-      md5 = "cbb8e403c2ba05aeaa419d51fdb93736";
+      url = "https://files.pythonhosted.org/packages/83/80/8ef3a11a15f8eaafafa0937b20c1b3f73527e69ab6b3fa1cf94a5a96aabb/future-0.14.3.tar.gz";
+      sha256 = "1savk7jx7hal032f522c5ajhh8fra6gmnadrj9adv5qxi18pv1b2";
     };
     meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+      license = [ { fullName = "OSI Approved"; } pkgs.lib.licenses.mit ];
     };
   };
-  configobj = super.buildPythonPackage {
-    name = "configobj-5.0.6";
-    buildInputs = with self; [];
+  "futures" = super.buildPythonPackage {
+    name = "futures-3.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz";
-      md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
+      url = "https://files.pythonhosted.org/packages/f8/e7/fc0fcbeb9193ba2d4de00b065e7fd5aecd0679e93ce95a07322b2b1434f4/futures-3.0.2.tar.gz";
+      sha256 = "0mz2pbgxbc2nbib1szifi07whjbfs4r02pv2z390z7p410awjgyw";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  configparser = super.buildPythonPackage {
-    name = "configparser-3.5.0";
-    buildInputs = with self; [];
+  "gevent" = super.buildPythonPackage {
+    name = "gevent-1.3.5";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."greenlet"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz";
-      md5 = "cfdd915a5b7a6c09917a64a573140538";
+      url = "https://files.pythonhosted.org/packages/e6/0a/fc345c6e6161f84484870dbcaa58e427c10bd9bdcd08a69bed3d6b398bf1/gevent-1.3.5.tar.gz";
+      sha256 = "1w3gydxirgd2f60c5yv579w4903ds9s4g3587ik4jby97hgqc5bz";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  cov-core = super.buildPythonPackage {
-    name = "cov-core-1.15.0";
-    buildInputs = with self; [];
+  "gnureadline" = super.buildPythonPackage {
+    name = "gnureadline-6.3.8";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/50/64/86085c823cd78f9df9d8e33dce0baa71618016f8860460b82cf6610e1eb3/gnureadline-6.3.8.tar.gz";
+      sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq";
+    };
+    meta = {
+      license = [ { fullName = "GNU General Public License v3 (GPLv3)"; } pkgs.lib.licenses.gpl1 ];
+    };
+  };
+  "gprof2dot" = super.buildPythonPackage {
+    name = "gprof2dot-2017.9.19";
     doCheck = false;
-    propagatedBuildInputs = with self; [coverage];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
+      sha256 = "17ih23ld2nzgc3xwgbay911l6lh96jp1zshmskm17n1gg2i7mg6f";
+    };
+    meta = {
+      license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
+    };
+  };
+  "graphviz" = super.buildPythonPackage {
+    name = "graphviz-0.9";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/4b/87/13e75a47b4ba1be06f29f6d807ca99638bedc6b57fa491cd3de891ca2923/cov-core-1.15.0.tar.gz";
-      md5 = "f519d4cb4c4e52856afb14af52919fe6";
+      url = "https://files.pythonhosted.org/packages/2b/e6/71521bab8fb99833133f08f6ac0460e2f6b425a7f75ac4b02323c3c3b512/graphviz-0.9.zip";
+      sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "greenlet" = super.buildPythonPackage {
+    name = "greenlet-0.4.13";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/13/de/ba92335e9e76040ca7274224942282a80d54f85e342a5e33c5277c7f87eb/greenlet-0.4.13.tar.gz";
+      sha256 = "1r412gfx25jrdiv444prmz5a8igrfabwnwqyr6b52ypq7ga87vqg";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  coverage = super.buildPythonPackage {
-    name = "coverage-3.7.1";
-    buildInputs = with self; [];
+  "gunicorn" = super.buildPythonPackage {
+    name = "gunicorn-19.9.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
-      md5 = "c47b36ceb17eaff3ecfab3bcd347d0df";
+      url = "https://files.pythonhosted.org/packages/47/52/68ba8e5e8ba251e54006a49441f7ccabca83b6bef5aedacb4890596c7911/gunicorn-19.9.0.tar.gz";
+      sha256 = "1wzlf4xmn6qjirh5w81l6i6kqjnab1n1qqkh7zsj1yb6gh4n49ps";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  cssselect = super.buildPythonPackage {
-    name = "cssselect-1.0.1";
-    buildInputs = with self; [];
+  "html5lib" = super.buildPythonPackage {
+    name = "html5lib-1.0.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."webencodings"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/77/ff/9c865275cd19290feba56344eba570e719efb7ca5b34d67ed12b22ebbb0d/cssselect-1.0.1.tar.gz";
-      md5 = "3fa03bf82a9f0b1223c0f1eb1369e139";
+      url = "https://files.pythonhosted.org/packages/85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f/html5lib-1.0.1.tar.gz";
+      sha256 = "0dipzfrycv6j1jw82v9b7d8lzggx3x8xngx6l4xrqkxwvg7hvjv6";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  decorator = super.buildPythonPackage {
-    name = "decorator-4.1.2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
-      md5 = "a0f7f4fe00ae2dde93494d90c192cf8c";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  deform = super.buildPythonPackage {
-    name = "deform-2.0.4";
-    buildInputs = with self; [];
+  "hupper" = super.buildPythonPackage {
+    name = "hupper-1.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [Chameleon colander iso8601 peppercorn translationstring zope.deprecation];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/66/3b/eefcb07abcab7a97f6665aa2d0cf1af741d9d6e78a2e4657fd2b89f89880/deform-2.0.4.tar.gz";
-      md5 = "34756e42cf50dd4b4430809116c4ec0a";
-    };
-    meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-    };
-  };
-  docutils = super.buildPythonPackage {
-    name = "docutils-0.14";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
-      md5 = "c53768d63db3873b7d452833553469de";
+      url = "https://files.pythonhosted.org/packages/51/0c/96335b1f2f32245fb871eea5bb9773196505ddb71fad15190056a282df9e/hupper-1.3.tar.gz";
+      sha256 = "1pkyrm9c2crc32ps00k1ahnc5clj3pjwiarc7j0x8aykwih7ff10";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  dogpile.cache = super.buildPythonPackage {
-    name = "dogpile.cache-0.6.4";
-    buildInputs = with self; [];
+  "infrae.cache" = super.buildPythonPackage {
+    name = "infrae.cache-1.0.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."beaker"
+      self."repoze.lru"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b6/3d/35c05ca01c070bb70d9d422f2c4858ecb021b05b21af438fec5ccd7b945c/dogpile.cache-0.6.4.tar.gz";
-      md5 = "66e0a6cae6c08cb1ea25f89d0eadfeb0";
+      url = "https://files.pythonhosted.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
+      sha256 = "1dvqsjn8vw253wz9d1pz17j79mf4bs53dvp2qxck2qdp1am1njw4";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
-  dogpile.core = super.buildPythonPackage {
-    name = "dogpile.core-0.4.1";
-    buildInputs = with self; [];
+  "invoke" = super.buildPythonPackage {
+    name = "invoke-0.13.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/0e/77/e72abc04c22aedf874301861e5c1e761231c288b5de369c18be8f4b5c9bb/dogpile.core-0.4.1.tar.gz";
-      md5 = "01cb19f52bba3e95c9b560f39341f045";
+      url = "https://files.pythonhosted.org/packages/47/bf/d07ef52fa1ac645468858bbac7cb95b246a972a045e821493d17d89c81be/invoke-0.13.0.tar.gz";
+      sha256 = "0794vhgxfmkh0vzkkg5cfv1w82g3jc3xr18wim29far9qpx9468s";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  ecdsa = super.buildPythonPackage {
-    name = "ecdsa-0.13";
-    buildInputs = with self; [];
+  "ipaddress" = super.buildPythonPackage {
+    name = "ipaddress-1.0.22";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f9/e5/99ebb176e47f150ac115ffeda5fedb6a3dbb3c00c74a59fd84ddf12f5857/ecdsa-0.13.tar.gz";
-      md5 = "1f60eda9cb5c46722856db41a3ae6670";
+      url = "https://files.pythonhosted.org/packages/97/8d/77b8cedcfbf93676148518036c6b1ce7f8e14bf07e95d7fd4ddcb8cc052f/ipaddress-1.0.22.tar.gz";
+      sha256 = "0b570bm6xqpjwqis15pvdy6lyvvzfndjvkynilcddjj5x98wfimi";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  elasticsearch = super.buildPythonPackage {
-    name = "elasticsearch-2.3.0";
-    buildInputs = with self; [];
+  "ipdb" = super.buildPythonPackage {
+    name = "ipdb-0.11";
     doCheck = false;
-    propagatedBuildInputs = with self; [urllib3];
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."ipython"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/10/35/5fd52c5f0b0ee405ed4b5195e8bce44c5e041787680dc7b94b8071cac600/elasticsearch-2.3.0.tar.gz";
-      md5 = "2550f3b51629cf1ef9636608af92c340";
+      url = "https://files.pythonhosted.org/packages/80/fe/4564de08f174f3846364b3add8426d14cebee228f741c27e702b2877e85b/ipdb-0.11.tar.gz";
+      sha256 = "02m0l8wrhhd3z7dg3czn5ys1g5pxib516hpshdzp7rxzsxgcd0bh";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  elasticsearch-dsl = super.buildPythonPackage {
-    name = "elasticsearch-dsl-2.2.0";
-    buildInputs = with self; [];
+  "ipython" = super.buildPythonPackage {
+    name = "ipython-5.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six python-dateutil elasticsearch];
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."decorator"
+      self."pickleshare"
+      self."simplegeneric"
+      self."traitlets"
+      self."prompt-toolkit"
+      self."pygments"
+      self."pexpect"
+      self."backports.shutil-get-terminal-size"
+      self."pathlib2"
+      self."pexpect"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/66/2f/52a086968788e58461641570f45c3207a52d46ebbe9b77dc22b6a8ffda66/elasticsearch-dsl-2.2.0.tar.gz";
-      md5 = "fa6bd3c87ea3caa8f0f051bc37c53221";
+      url = "https://files.pythonhosted.org/packages/89/63/a9292f7cd9d0090a0f995e1167f3f17d5889dcbc9a175261719c513b9848/ipython-5.1.0.tar.gz";
+      sha256 = "0qdrf6aj9kvjczd5chj1my8y2iq09am9l8bb2a1334a52d76kx3y";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  entrypoints = super.buildPythonPackage {
-    name = "entrypoints-0.2.2";
-    buildInputs = with self; [];
+  "ipython-genutils" = super.buildPythonPackage {
+    name = "ipython-genutils-0.2.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [configparser];
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313";
-      md5 = "7db37771aea9ac9fefe093e5d6987313";
+      url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
+      sha256 = "1a4bc9y8hnvq6cp08qs4mckgm6i6ajpndp4g496rvvzcfmp12bpb";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "iso8601" = super.buildPythonPackage {
+    name = "iso8601-0.1.11";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/c0/75/c9209ee4d1b5975eb8c2cba4428bde6b61bd55664a98290dd015cdb18e98/iso8601-0.1.11.tar.gz";
+      sha256 = "0c7gh3lsdjds262h0v1sqc66l7hqgfwbakn96qrhdbl0i3vm5yz8";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  enum34 = super.buildPythonPackage {
-    name = "enum34-1.1.6";
-    buildInputs = with self; [];
+  "itsdangerous" = super.buildPythonPackage {
+    name = "itsdangerous-0.24";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz";
-      md5 = "5f13a0841a61f7fc295c514490d120d0";
+      url = "https://files.pythonhosted.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz";
+      sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  funcsigs = super.buildPythonPackage {
-    name = "funcsigs-1.0.2";
-    buildInputs = with self; [];
+  "jinja2" = super.buildPythonPackage {
+    name = "jinja2-2.9.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz";
-      md5 = "7e583285b1fb8a76305d6d68f4ccc14e";
-    };
-    meta = {
-      license = [ { fullName = "ASL"; } pkgs.lib.licenses.asl20 ];
-    };
-  };
-  functools32 = super.buildPythonPackage {
-    name = "functools32-3.2.3.post2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."markupsafe"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz";
-      md5 = "09f24ffd9af9f6cd0f63cb9f4e23d4b2";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.psfl ];
-    };
-  };
-  future = super.buildPythonPackage {
-    name = "future-0.14.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/83/80/8ef3a11a15f8eaafafa0937b20c1b3f73527e69ab6b3fa1cf94a5a96aabb/future-0.14.3.tar.gz";
-      md5 = "e94079b0bd1fc054929e8769fc0f6083";
-    };
-    meta = {
-      license = [ { fullName = "OSI Approved"; } pkgs.lib.licenses.mit ];
-    };
-  };
-  futures = super.buildPythonPackage {
-    name = "futures-3.0.2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f8/e7/fc0fcbeb9193ba2d4de00b065e7fd5aecd0679e93ce95a07322b2b1434f4/futures-3.0.2.tar.gz";
-      md5 = "42aaf1e4de48d6e871d77dc1f9d96d5a";
+      url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  gevent = super.buildPythonPackage {
-    name = "gevent-1.2.2";
-    buildInputs = with self; [];
+  "jsonschema" = super.buildPythonPackage {
+    name = "jsonschema-2.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [greenlet];
+    propagatedBuildInputs = [
+      self."functools32"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/1b/92/b111f76e54d2be11375b47b213b56687214f258fd9dae703546d30b837be/gevent-1.2.2.tar.gz";
-      md5 = "7f0baf355384fe5ff2ecf66853422554";
+      url = "https://files.pythonhosted.org/packages/58/b9/171dbb07e18c6346090a37f03c7e74410a1a56123f847efed59af260a298/jsonschema-2.6.0.tar.gz";
+      sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  gnureadline = super.buildPythonPackage {
-    name = "gnureadline-6.3.8";
-    buildInputs = with self; [];
+  "jupyter-client" = super.buildPythonPackage {
+    name = "jupyter-client-5.0.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."traitlets"
+      self."jupyter-core"
+      self."pyzmq"
+      self."python-dateutil"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/50/64/86085c823cd78f9df9d8e33dce0baa71618016f8860460b82cf6610e1eb3/gnureadline-6.3.8.tar.gz";
-      md5 = "ba341f4b907250bd1f47dbc06290604f";
+      url = "https://files.pythonhosted.org/packages/e5/6f/65412ed462202b90134b7e761b0b7e7f949e07a549c1755475333727b3d0/jupyter_client-5.0.0.tar.gz";
+      sha256 = "0nxw4rqk4wsjhc87gjqd7pv89cb9dnimcfnmcmp85bmrvv1gjri7";
     };
     meta = {
-      license = [ { fullName = "GNU General Public License v3 (GPLv3)"; } pkgs.lib.licenses.gpl1 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  gprof2dot = super.buildPythonPackage {
-    name = "gprof2dot-2017.9.19";
-    buildInputs = with self; [];
+  "jupyter-core" = super.buildPythonPackage {
+    name = "jupyter-core-4.4.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."traitlets"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
-      md5 = "cda2d552bb0d0b9f16e6824a9aabd225";
+      url = "https://files.pythonhosted.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
+      sha256 = "1dy083rarba8prn9f9srxq3c7n7vyql02ycrqq306c40lr57aw5s";
     };
     meta = {
-      license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "kombu" = super.buildPythonPackage {
+    name = "kombu-4.2.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."amqp"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ab/b1/46a7a8babf5e60f3b2ca081a100af8edfcf132078a726375f52a054e70cf/kombu-4.2.0.tar.gz";
+      sha256 = "1yz19qlqf0inl1mnwlpq9j6kj9r67clpy0xg99phyg4329rw80fn";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  graphviz = super.buildPythonPackage {
-    name = "graphviz-0.8.2";
-    buildInputs = with self; [];
+  "lxml" = super.buildPythonPackage {
+    name = "lxml-3.7.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/d1/63b62dee9e55368f60b5ea445e6afb361bb47e692fc27553f3672e16efb8/graphviz-0.8.2.zip";
-      md5 = "50866e780f43e1cb0d073c70424fcaff";
+      url = "https://files.pythonhosted.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
+      sha256 = "1iv1jgkqn1hdh1xyxri6g0y1s67h01jzjkw2nhkx3rqylmw2sl5a";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  greenlet = super.buildPythonPackage {
-    name = "greenlet-0.4.13";
-    buildInputs = with self; [];
+  "mako" = super.buildPythonPackage {
+    name = "mako-1.0.7";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."markupsafe"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/13/de/ba92335e9e76040ca7274224942282a80d54f85e342a5e33c5277c7f87eb/greenlet-0.4.13.tar.gz";
-      md5 = "6e0b9dd5385f81d478451ec8ed1d62b3";
+      url = "https://files.pythonhosted.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-1.0.7.tar.gz";
+      sha256 = "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  gunicorn = super.buildPythonPackage {
-    name = "gunicorn-19.7.1";
-    buildInputs = with self; [];
+  "markdown" = super.buildPythonPackage {
+    name = "markdown-2.6.11";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/30/3a/10bb213cede0cc4d13ac2263316c872a64bf4c819000c8ccd801f1d5f822/gunicorn-19.7.1.tar.gz";
-      md5 = "174d3c3cd670a5be0404d84c484e590c";
+      url = "https://files.pythonhosted.org/packages/b3/73/fc5c850f44af5889192dff783b7b0d8f3fe8d30b65c8e3f78f8f0265fecf/Markdown-2.6.11.tar.gz";
+      sha256 = "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  html5lib = super.buildPythonPackage {
-    name = "html5lib-1.0.1";
-    buildInputs = with self; [];
+  "markupsafe" = super.buildPythonPackage {
+    name = "markupsafe-1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six webencodings];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f/html5lib-1.0.1.tar.gz";
-      md5 = "942a0688d6bdf20d087c9805c40182ad";
+      url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  hupper = super.buildPythonPackage {
-    name = "hupper-1.0";
-    buildInputs = with self; [];
+  "meld3" = super.buildPythonPackage {
+    name = "meld3-1.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2e/07/df892c564dc09bb3cf6f6deb976c26adf9117db75ba218cb4353dbc9d826/hupper-1.0.tar.gz";
-      md5 = "26e77da7d5ac5858f59af050d1a6eb5a";
+      url = "https://files.pythonhosted.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f/meld3-1.0.2.tar.gz";
+      sha256 = "0n4mkwlpsqnmn0dm0wm5hn9nkda0nafl0jdy5sdl5977znh59dzp";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  infrae.cache = super.buildPythonPackage {
-    name = "infrae.cache-1.0.1";
-    buildInputs = with self; [];
+  "mistune" = super.buildPythonPackage {
+    name = "mistune-0.8.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [Beaker repoze.lru];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
-      md5 = "b09076a766747e6ed2a755cc62088e32";
+      url = "https://files.pythonhosted.org/packages/9d/be/e06d4346cc608a01dec6bf770d7d0303a4fd6db588b318ced18f5f257145/mistune-0.8.3.tar.gz";
+      sha256 = "06b662p6kf46wh2jsabaqhaq4bz1srh2zxkrnx4yg96azlxw645w";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  invoke = super.buildPythonPackage {
-    name = "invoke-0.13.0";
-    buildInputs = with self; [];
+  "mock" = super.buildPythonPackage {
+    name = "mock-1.0.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/47/bf/d07ef52fa1ac645468858bbac7cb95b246a972a045e821493d17d89c81be/invoke-0.13.0.tar.gz";
-      md5 = "c0d1ed4bfb34eaab551662d8cfee6540";
+      url = "https://files.pythonhosted.org/packages/a2/52/7edcd94f0afb721a2d559a5b9aae8af4f8f2c79bc63fdbe8a8a6c9b23bbe/mock-1.0.1.tar.gz";
+      sha256 = "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  ipaddress = super.buildPythonPackage {
-    name = "ipaddress-1.0.19";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f0/ba/860a4a3e283456d6b7e2ab39ce5cf11a3490ee1a363652ac50abf9f0f5df/ipaddress-1.0.19.tar.gz";
-      md5 = "d0687efaf93a32476d81e90ba0609c57";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.psfl ];
-    };
-  };
-  ipdb = super.buildPythonPackage {
-    name = "ipdb-0.10.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [setuptools ipython];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/ad/cc/0e7298e1fbf2efd52667c9354a12aa69fb6f796ce230cca03525051718ef/ipdb-0.10.3.tar.gz";
-      md5 = "def1f6ac075d54bdee07e6501263d4fa";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  ipython = super.buildPythonPackage {
-    name = "ipython-5.1.0";
-    buildInputs = with self; [];
+  "more-itertools" = super.buildPythonPackage {
+    name = "more-itertools-4.3.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools decorator pickleshare simplegeneric traitlets prompt-toolkit Pygments pexpect backports.shutil-get-terminal-size pathlib2 pexpect];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/89/63/a9292f7cd9d0090a0f995e1167f3f17d5889dcbc9a175261719c513b9848/ipython-5.1.0.tar.gz";
-      md5 = "47c8122420f65b58784cb4b9b4af35e3";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  ipython-genutils = super.buildPythonPackage {
-    name = "ipython-genutils-0.2.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
-      md5 = "5a4f9781f78466da0ea1a648f3e1f79f";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  iso8601 = super.buildPythonPackage {
-    name = "iso8601-0.1.12";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/45/13/3db24895497345fb44c4248c08b16da34a9eb02643cea2754b21b5ed08b0/iso8601-0.1.12.tar.gz";
-      md5 = "4de940f691c5ea759fb254384c8ddcf6";
+      url = "https://files.pythonhosted.org/packages/88/ff/6d485d7362f39880810278bdc906c13300db05485d9c65971dec1142da6a/more-itertools-4.3.0.tar.gz";
+      sha256 = "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  itsdangerous = super.buildPythonPackage {
-    name = "itsdangerous-0.24";
-    buildInputs = with self; [];
+  "msgpack-python" = super.buildPythonPackage {
+    name = "msgpack-python-0.5.6";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/8a/20/6eca772d1a5830336f84aca1d8198e5a3f4715cd1c7fc36d3cc7f7185091/msgpack-python-0.5.6.tar.gz";
+      sha256 = "16wh8qgybmfh4pjp8vfv78mdlkxfmcasg78lzlnm6nslsfkci31p";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "mysql-python" = super.buildPythonPackage {
+    name = "mysql-python-1.2.5";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz";
-      md5 = "a3d55aa79369aef5345c036a8a26307f";
+      url = "https://files.pythonhosted.org/packages/a5/e9/51b544da85a36a68debe7a7091f068d802fc515a3a202652828c73453cad/MySQL-python-1.2.5.zip";
+      sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.gpl1 ];
+    };
+  };
+  "nbconvert" = super.buildPythonPackage {
+    name = "nbconvert-5.3.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."mistune"
+      self."jinja2"
+      self."pygments"
+      self."traitlets"
+      self."jupyter-core"
+      self."nbformat"
+      self."entrypoints"
+      self."bleach"
+      self."pandocfilters"
+      self."testpath"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/b9/a4/d0a0938ad6f5eeb4dea4e73d255c617ef94b0b2849d51194c9bbdb838412/nbconvert-5.3.1.tar.gz";
+      sha256 = "1f9dkvpx186xjm4xab0qbph588mncp4vqk3fmxrsnqs43mks9c8j";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  jsonschema = super.buildPythonPackage {
-    name = "jsonschema-2.6.0";
-    buildInputs = with self; [];
+  "nbformat" = super.buildPythonPackage {
+    name = "nbformat-4.4.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [functools32];
+    propagatedBuildInputs = [
+      self."ipython-genutils"
+      self."traitlets"
+      self."jsonschema"
+      self."jupyter-core"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/58/b9/171dbb07e18c6346090a37f03c7e74410a1a56123f847efed59af260a298/jsonschema-2.6.0.tar.gz";
-      md5 = "50c6b69a373a8b55ff1e0ec6e78f13f4";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  jupyter-client = super.buildPythonPackage {
-    name = "jupyter-client-5.0.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [traitlets jupyter-core pyzmq python-dateutil];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/e5/6f/65412ed462202b90134b7e761b0b7e7f949e07a549c1755475333727b3d0/jupyter_client-5.0.0.tar.gz";
-      md5 = "1acd331b5c9fb4d79dae9939e79f2426";
+      url = "https://files.pythonhosted.org/packages/6e/0e/160754f7ae3e984863f585a3743b0ed1702043a81245907c8fae2d537155/nbformat-4.4.0.tar.gz";
+      sha256 = "00nlf08h8yc4q73nphfvfhxrcnilaqanb8z0mdy6nxk0vzq4wjgp";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  jupyter-core = super.buildPythonPackage {
-    name = "jupyter-core-4.4.0";
-    buildInputs = with self; [];
+  "objgraph" = super.buildPythonPackage {
+    name = "objgraph-3.1.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [traitlets];
+    propagatedBuildInputs = [
+      self."graphviz"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
-      md5 = "7829fc07884ed98459e170f217e2a5ba";
+      url = "https://files.pythonhosted.org/packages/be/58/9ca81a20cc837054e94866df1475d899caaa94f3732b8a46006858b015f7/objgraph-3.1.1.tar.gz";
+      sha256 = "17aq4cwainiwvj8x61j0hx45c313bkwza5fijnmmw8v8glyy2bcc";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "packaging" = super.buildPythonPackage {
+    name = "packaging-15.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/24/c4/185da1304f07047dc9e0c46c31db75c0351bd73458ac3efad7da3dbcfbe1/packaging-15.2.tar.gz";
+      sha256 = "1zn60w84bxvw6wypffka18ca66pa1k2cfrq3cq8fnsfja5m3k4ng";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "pandocfilters" = super.buildPythonPackage {
+    name = "pandocfilters-1.4.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/4c/ea/236e2584af67bb6df960832731a6e5325fd4441de001767da328c33368ce/pandocfilters-1.4.2.tar.gz";
+      sha256 = "1a8d9b7s48gmq9zj0pmbyv2sivn5i7m6mybgpkk4jm5vd7hp1pdk";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  kombu = super.buildPythonPackage {
-    name = "kombu-4.1.0";
-    buildInputs = with self; [];
+  "paste" = super.buildPythonPackage {
+    name = "paste-2.0.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [amqp];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/03/5e/1a47d1e543d4943d65330af4e4406049f443878818fb65bfdc651bb93a96/kombu-4.1.0.tar.gz";
-      md5 = "2fb2be9fec0e6514231bba23a3779439";
+      url = "https://files.pythonhosted.org/packages/30/c3/5c2f7c7a02e4f58d4454353fa1c32c94f79fa4e36d07a67c0ac295ea369e/Paste-2.0.3.tar.gz";
+      sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "pastedeploy" = super.buildPythonPackage {
+    name = "pastedeploy-1.5.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
+      sha256 = "1jz3m4hq8v6hyhfjz9425nd3nvn52cvbfipdcd72krjmla4qz1fm";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  lxml = super.buildPythonPackage {
-    name = "lxml-3.7.3";
-    buildInputs = with self; [];
+  "pastescript" = super.buildPythonPackage {
+    name = "pastescript-2.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."paste"
+      self."pastedeploy"
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
-      md5 = "075692ce442e69bbd604d44e21c02753";
+      url = "https://files.pythonhosted.org/packages/e5/f0/78e766c3dcc61a4f3a6f71dd8c95168ae9c7a31722b5663d19c1fdf62cb6/PasteScript-2.0.2.tar.gz";
+      sha256 = "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  meld3 = super.buildPythonPackage {
-    name = "meld3-1.0.2";
-    buildInputs = with self; [];
+  "pathlib2" = super.buildPythonPackage {
+    name = "pathlib2-2.3.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."scandir"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f/meld3-1.0.2.tar.gz";
-      md5 = "3ccc78cd79cffd63a751ad7684c02c91";
+      url = "https://files.pythonhosted.org/packages/a1/14/df0deb867c2733f7d857523c10942b3d6612a1b222502fdffa9439943dfb/pathlib2-2.3.0.tar.gz";
+      sha256 = "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "peppercorn" = super.buildPythonPackage {
+    name = "peppercorn-0.5";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/45/ec/a62ec317d1324a01567c5221b420742f094f05ee48097e5157d32be3755c/peppercorn-0.5.tar.gz";
+      sha256 = "0jvp144zn7yqk9kbpxc059167mlqk85i5lpvl1niw8gsa5fvl74j";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  mistune = super.buildPythonPackage {
-    name = "mistune-0.8.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/9d/be/e06d4346cc608a01dec6bf770d7d0303a4fd6db588b318ced18f5f257145/mistune-0.8.3.tar.gz";
-      md5 = "a5e4043e93fb8f9082e27f29eeb5e054";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  mock = super.buildPythonPackage {
-    name = "mock-1.0.1";
-    buildInputs = with self; [];
+  "pexpect" = super.buildPythonPackage {
+    name = "pexpect-4.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."ptyprocess"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a2/52/7edcd94f0afb721a2d559a5b9aae8af4f8f2c79bc63fdbe8a8a6c9b23bbe/mock-1.0.1.tar.gz";
-      md5 = "c3971991738caa55ec7c356bbc154ee2";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  msgpack-python = super.buildPythonPackage {
-    name = "msgpack-python-0.4.8";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/21/27/8a1d82041c7a2a51fcc73675875a5f9ea06c2663e02fcfeb708be1d081a0/msgpack-python-0.4.8.tar.gz";
-      md5 = "dcd854fb41ee7584ebbf35e049e6be98";
+      url = "https://files.pythonhosted.org/packages/89/43/07d07654ee3e25235d8cea4164cdee0ec39d1fda8e9203156ebe403ffda4/pexpect-4.6.0.tar.gz";
+      sha256 = "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
-    };
-  };
-  nbconvert = super.buildPythonPackage {
-    name = "nbconvert-5.3.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [mistune Jinja2 Pygments traitlets jupyter-core nbformat entrypoints bleach pandocfilters testpath];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/b9/a4/d0a0938ad6f5eeb4dea4e73d255c617ef94b0b2849d51194c9bbdb838412/nbconvert-5.3.1.tar.gz";
-      md5 = "c128d0d93d02f70a85429a383dae96d2";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
     };
   };
-  nbformat = super.buildPythonPackage {
-    name = "nbformat-4.4.0";
-    buildInputs = with self; [];
+  "pickleshare" = super.buildPythonPackage {
+    name = "pickleshare-0.7.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [ipython-genutils traitlets jsonschema jupyter-core];
+    propagatedBuildInputs = [
+      self."pathlib2"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6e/0e/160754f7ae3e984863f585a3743b0ed1702043a81245907c8fae2d537155/nbformat-4.4.0.tar.gz";
-      md5 = "2d5f873138d9fbc2a3f9eaaebca3b8a1";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  objgraph = super.buildPythonPackage {
-    name = "objgraph-3.1.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [graphviz];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/be/58/9ca81a20cc837054e94866df1475d899caaa94f3732b8a46006858b015f7/objgraph-3.1.1.tar.gz";
-      md5 = "253af9944763377877c3678d8aaebb8b";
+      url = "https://files.pythonhosted.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz";
+      sha256 = "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  packaging = super.buildPythonPackage {
-    name = "packaging-15.2";
-    buildInputs = with self; [];
+  "plaster" = super.buildPythonPackage {
+    name = "plaster-1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/24/c4/185da1304f07047dc9e0c46c31db75c0351bd73458ac3efad7da3dbcfbe1/packaging-15.2.tar.gz";
-      md5 = "c16093476f6ced42128bf610e5db3784";
+      url = "https://files.pythonhosted.org/packages/37/e1/56d04382d718d32751017d32f351214384e529b794084eee20bb52405563/plaster-1.0.tar.gz";
+      sha256 = "1hy8k0nv2mxq94y5aysk6hjk9ryb4bsd13g83m60hcyzxz3wflc3";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pandocfilters = super.buildPythonPackage {
-    name = "pandocfilters-1.4.2";
-    buildInputs = with self; [];
+  "plaster-pastedeploy" = super.buildPythonPackage {
+    name = "plaster-pastedeploy-0.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."pastedeploy"
+      self."plaster"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/4c/ea/236e2584af67bb6df960832731a6e5325fd4441de001767da328c33368ce/pandocfilters-1.4.2.tar.gz";
-      md5 = "dc391791ef54c7de1572d7b46b63361f";
+      url = "https://files.pythonhosted.org/packages/3f/e7/6a6833158d2038ec40085433308a1e164fd1dac595513f6dd556d5669bb8/plaster_pastedeploy-0.6.tar.gz";
+      sha256 = "1bkggk18f4z2bmsmxyxabvf62znvjwbivzh880419r3ap0616cf2";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pathlib2 = super.buildPythonPackage {
-    name = "pathlib2-2.3.0";
-    buildInputs = with self; [];
+  "pluggy" = super.buildPythonPackage {
+    name = "pluggy-0.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six scandir];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a1/14/df0deb867c2733f7d857523c10942b3d6612a1b222502fdffa9439943dfb/pathlib2-2.3.0.tar.gz";
-      md5 = "89c90409d11fd5947966b6a30a47d18c";
+      url = "https://files.pythonhosted.org/packages/11/bf/cbeb8cdfaffa9f2ea154a30ae31a9d04a1209312e2919138b4171a1f8199/pluggy-0.6.0.tar.gz";
+      sha256 = "1zqckndfn85l1cd8pndw212zg1bq9fkg1nnj32kp2mppppsyg2kz";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  peppercorn = super.buildPythonPackage {
-    name = "peppercorn-0.5";
-    buildInputs = with self; [];
+  "prompt-toolkit" = super.buildPythonPackage {
+    name = "prompt-toolkit-1.0.15";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."wcwidth"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/45/ec/a62ec317d1324a01567c5221b420742f094f05ee48097e5157d32be3755c/peppercorn-0.5.tar.gz";
-      md5 = "f08efbca5790019ab45d76b7244abd40";
+      url = "https://files.pythonhosted.org/packages/8a/ad/cf6b128866e78ad6d7f1dc5b7f99885fb813393d9860778b2984582e81b5/prompt_toolkit-1.0.15.tar.gz";
+      sha256 = "05v9h5nydljwpj5nm8n804ms0glajwfy1zagrzqrg91wk3qqi1c5";
     };
     meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pexpect = super.buildPythonPackage {
-    name = "pexpect-4.4.0";
-    buildInputs = with self; [];
+  "psutil" = super.buildPythonPackage {
+    name = "psutil-5.4.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [ptyprocess];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/c3/60c0cbf96f242d0b47a82e9ca634dcd6dcb043832cf05e17540812e1c707/pexpect-4.4.0.tar.gz";
-      md5 = "e9b07f0765df8245ac72201d757baaef";
+      url = "https://files.pythonhosted.org/packages/51/9e/0f8f5423ce28c9109807024f7bdde776ed0b1161de20b408875de7e030c3/psutil-5.4.6.tar.gz";
+      sha256 = "1xmw4qi6hnrhw81xqzkvmsm9im7j2vkk4v26ycjwq2jczqsmlvk8";
     };
     meta = {
-      license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "psycopg2" = super.buildPythonPackage {
+    name = "psycopg2-2.7.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/74/83/51580322ed0e82cba7ad8e0af590b8fb2cf11bd5aaa1ed872661bd36f462/psycopg2-2.7.4.tar.gz";
+      sha256 = "02b2yaf1hlwb91xkscbzmajpfj5z3d8yikzh5r48fs8gss8i3xcb";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
     };
   };
-  pickleshare = super.buildPythonPackage {
-    name = "pickleshare-0.7.4";
-    buildInputs = with self; [];
+  "ptyprocess" = super.buildPythonPackage {
+    name = "ptyprocess-0.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [pathlib2];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz";
-      md5 = "6a9e5dd8dfc023031f6b7b3f824cab12";
+      url = "https://files.pythonhosted.org/packages/7d/2d/e4b8733cf79b7309d84c9081a4ab558c89d8c89da5961bf4ddb050ca1ce0/ptyprocess-0.6.0.tar.gz";
+      sha256 = "1h4lcd3w5nrxnsk436ar7fwkiy5rfn5wj2xwy9l0r4mdqnf2jgwj";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [  ];
     };
   };
-  plaster = super.buildPythonPackage {
-    name = "plaster-1.0";
-    buildInputs = with self; [];
+  "py" = super.buildPythonPackage {
+    name = "py-1.5.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/37/e1/56d04382d718d32751017d32f351214384e529b794084eee20bb52405563/plaster-1.0.tar.gz";
-      md5 = "80e6beb4760c16fea31754babcc0576e";
+      url = "https://files.pythonhosted.org/packages/f7/84/b4c6e84672c4ceb94f727f3da8344037b62cee960d80e999b1cd9b832d83/py-1.5.3.tar.gz";
+      sha256 = "10gq2lckvgwlk9w6yzijhzkarx44hsaknd0ypa08wlnpjnsgmj99";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  plaster-pastedeploy = super.buildPythonPackage {
-    name = "plaster-pastedeploy-0.4.2";
-    buildInputs = with self; [];
+  "py-bcrypt" = super.buildPythonPackage {
+    name = "py-bcrypt-0.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [PasteDeploy plaster];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2c/62/0daf9c0be958e785023e583e51baac15863699e956bfb3d448898d80edd8/plaster_pastedeploy-0.4.2.tar.gz";
-      md5 = "58fd7852002909378e818c9d5b71e90a";
+      url = "https://files.pythonhosted.org/packages/68/b1/1c3068c5c4d2e35c48b38dcc865301ebfdf45f54507086ac65ced1fd3b3d/py-bcrypt-0.4.tar.gz";
+      sha256 = "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  prompt-toolkit = super.buildPythonPackage {
-    name = "prompt-toolkit-1.0.15";
-    buildInputs = with self; [];
+  "py-gfm" = super.buildPythonPackage {
+    name = "py-gfm-0.1.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [six wcwidth];
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."markdown"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8a/ad/cf6b128866e78ad6d7f1dc5b7f99885fb813393d9860778b2984582e81b5/prompt_toolkit-1.0.15.tar.gz";
-      md5 = "8fe70295006dbc8afedd43e5eba99032";
+      url = "https://files.pythonhosted.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
+      sha256 = "162ggwwj0af9g3s1k8m4bfwbvis03x9pinnf35mj79pb90rf81zi";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "pyasn1" = super.buildPythonPackage {
+    name = "pyasn1-0.4.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/46/059775dc8e50f722d205452bced4b3cc965d27e8c3389156acd3b1123ae3/pyasn1-0.4.4.tar.gz";
+      sha256 = "0drilmx5j25aplfr5wrml0030cs5fgxp9yp94fhllxgx28yjm3zm";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  psutil = super.buildPythonPackage {
-    name = "psutil-5.4.3";
-    buildInputs = with self; [];
+  "pyasn1-modules" = super.buildPythonPackage {
+    name = "pyasn1-modules-0.2.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."pyasn1"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e2/e1/600326635f97fee89bf8426fef14c5c29f4849c79f68fd79f433d8c1bd96/psutil-5.4.3.tar.gz";
-      md5 = "3b291833dbea631db9d271aa602a169a";
+      url = "https://files.pythonhosted.org/packages/37/33/74ebdc52be534e683dc91faf263931bc00ae05c6073909fde53999088541/pyasn1-modules-0.2.2.tar.gz";
+      sha256 = "0ivm850yi7ajjbi8j115qpsj95bgxdsx48nbjzg0zip788c3xkx0";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  psycopg2 = super.buildPythonPackage {
-    name = "psycopg2-2.7.3.2";
-    buildInputs = with self; [];
+  "pycrypto" = super.buildPythonPackage {
+    name = "pycrypto-2.6.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/dd/47/000b405d73ca22980684fd7bd3318690cc03cfa3b2ae1c5b7fff8050b28a/psycopg2-2.7.3.2.tar.gz";
-      md5 = "8114e672d5f23fa5329874a4314fbd6f";
+      url = "https://files.pythonhosted.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-2.6.1.tar.gz";
+      sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
+      license = [ pkgs.lib.licenses.publicDomain ];
     };
   };
-  ptyprocess = super.buildPythonPackage {
-    name = "ptyprocess-0.5.2";
-    buildInputs = with self; [];
+  "pycurl" = super.buildPythonPackage {
+    name = "pycurl-7.43.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/51/83/5d07dc35534640b06f9d9f1a1d2bc2513fb9cc7595a1b0e28ae5477056ce/ptyprocess-0.5.2.tar.gz";
-      md5 = "d3b8febae1b8c53b054bd818d0bb8665";
+      url = "https://files.pythonhosted.org/packages/e8/e4/0dbb8735407189f00b33d84122b9be52c790c7c3b25286826f4e1bdb7bde/pycurl-7.43.0.2.tar.gz";
+      sha256 = "1915kb04k1j4y6k1dx1sgnbddxrl9r1n4q928if2lkrdm73xy30g";
     };
     meta = {
-      license = [  ];
+      license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
     };
   };
-  py = super.buildPythonPackage {
-    name = "py-1.5.2";
-    buildInputs = with self; [];
+  "pyflakes" = super.buildPythonPackage {
+    name = "pyflakes-0.8.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/90/e3/e075127d39d35f09a500ebb4a90afd10f9ef0a1d28a6d09abeec0e444fdd/py-1.5.2.tar.gz";
-      md5 = "279ca69c632069e1b71e11b14641ca28";
+      url = "https://files.pythonhosted.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
+      sha256 = "0sbpq6pqm1i9wqi41mlfrsc5rk92jv4mskvlyxmnhlbdnc80ma1z";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  py-bcrypt = super.buildPythonPackage {
-    name = "py-bcrypt-0.4";
-    buildInputs = with self; [];
+  "pygments" = super.buildPythonPackage {
+    name = "pygments-2.2.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/68/b1/1c3068c5c4d2e35c48b38dcc865301ebfdf45f54507086ac65ced1fd3b3d/py-bcrypt-0.4.tar.gz";
-      md5 = "dd8b367d6b716a2ea2e72392525f4e36";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  py-gfm = super.buildPythonPackage {
-    name = "py-gfm-0.1.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [setuptools Markdown];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
-      md5 = "e588d9e69640a241b97e2c59c22527a6";
+      url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pycrypto = super.buildPythonPackage {
-    name = "pycrypto-2.6.1";
-    buildInputs = with self; [];
+  "pygments-markdown-lexer" = super.buildPythonPackage {
+    name = "pygments-markdown-lexer-0.1.0.dev39";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."pygments"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-2.6.1.tar.gz";
-      md5 = "55a61a054aa66812daf5161a0d5d7eda";
+      url = "https://files.pythonhosted.org/packages/c3/12/674cdee66635d638cedb2c5d9c85ce507b7b2f91bdba29e482f1b1160ff6/pygments-markdown-lexer-0.1.0.dev39.zip";
+      sha256 = "1pzb5wy23q3fhs0rqzasjnw6hdzwjngpakb73i98cn0b8lk8q4jc";
     };
     meta = {
-      license = [ pkgs.lib.licenses.publicDomain ];
+      license = [ pkgs.lib.licenses.asl20 ];
     };
   };
-  pycurl = super.buildPythonPackage {
-    name = "pycurl-7.19.5";
-    buildInputs = with self; [];
+  "pymysql" = super.buildPythonPackage {
+    name = "pymysql-0.8.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6c/48/13bad289ef6f4869b1d8fc11ae54de8cfb3cc4a2eb9f7419c506f763be46/pycurl-7.19.5.tar.gz";
-      md5 = "47b4eac84118e2606658122104e62072";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
-    };
-  };
-  pyflakes = super.buildPythonPackage {
-    name = "pyflakes-0.8.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
-      md5 = "905fe91ad14b912807e8fdc2ac2e2c23";
+      url = "https://files.pythonhosted.org/packages/44/39/6bcb83cae0095a31b6be4511707fdf2009d3e29903a55a0494d3a9a2fac0/PyMySQL-0.8.1.tar.gz";
+      sha256 = "0a96crz55bw4h6myh833skrli7b0ck89m3x673y2z2ryy7zrpq9l";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pygments-markdown-lexer = super.buildPythonPackage {
-    name = "pygments-markdown-lexer-0.1.0.dev39";
-    buildInputs = with self; [];
+  "pyotp" = super.buildPythonPackage {
+    name = "pyotp-2.2.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [Pygments];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c3/12/674cdee66635d638cedb2c5d9c85ce507b7b2f91bdba29e482f1b1160ff6/pygments-markdown-lexer-0.1.0.dev39.zip";
-      md5 = "6360fe0f6d1f896e35b7a0142ce6459c";
+      url = "https://files.pythonhosted.org/packages/67/69/131f5ad63de40c30f3be88d891e4a2ea1b69398528db99bc1e5c543422fa/pyotp-2.2.6.tar.gz";
+      sha256 = "0sdxxvr3j4j0pk26v258jpxhgpbnpmyqhvzhl24hsd50j7fk14fx";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pyparsing = super.buildPythonPackage {
+  "pyparsing" = super.buildPythonPackage {
     name = "pyparsing-1.5.7";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6f/2c/47457771c02a8ff0f302b695e094ec309e30452232bd79198ee94fda689f/pyparsing-1.5.7.tar.gz";
-      md5 = "9be0fcdcc595199c646ab317c1d9a709";
+      url = "https://files.pythonhosted.org/packages/6f/2c/47457771c02a8ff0f302b695e094ec309e30452232bd79198ee94fda689f/pyparsing-1.5.7.tar.gz";
+      sha256 = "17z7ws076z977sclj628fvwrp8y9j2rvdjcsq42v129n1gwi8vk4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pyramid = super.buildPythonPackage {
-    name = "pyramid-1.9.1";
-    buildInputs = with self; [];
+  "pyramid" = super.buildPythonPackage {
+    name = "pyramid-1.9.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools WebOb repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy plaster plaster-pastedeploy hupper];
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."webob"
+      self."repoze.lru"
+      self."zope.interface"
+      self."zope.deprecation"
+      self."venusian"
+      self."translationstring"
+      self."pastedeploy"
+      self."plaster"
+      self."plaster-pastedeploy"
+      self."hupper"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9a/57/73447be9e7d0512d601e3f0a1fb9d7d1efb941911f49efdfe036d2826507/pyramid-1.9.1.tar.gz";
-      md5 = "0163e19c58c2d12976a3b6fdb57e052d";
+      url = "https://files.pythonhosted.org/packages/a0/c1/b321d07cfc4870541989ad131c86a1d593bfe802af0eca9718a0dadfb97a/pyramid-1.9.2.tar.gz";
+      sha256 = "09drsl0346nchgxp2j7sa5hlk7mkhfld9wvbd0wicacrp26a92fg";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  pyramid-beaker = super.buildPythonPackage {
+  "pyramid-beaker" = super.buildPythonPackage {
     name = "pyramid-beaker-0.8";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [pyramid Beaker];
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."beaker"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
-      md5 = "22f14be31b06549f80890e2c63a93834";
+      url = "https://files.pythonhosted.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
+      sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  pyramid-debugtoolbar = super.buildPythonPackage {
-    name = "pyramid-debugtoolbar-4.3";
-    buildInputs = with self; [];
+  "pyramid-debugtoolbar" = super.buildPythonPackage {
+    name = "pyramid-debugtoolbar-4.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [pyramid pyramid-mako repoze.lru Pygments ipaddress];
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."pyramid-mako"
+      self."repoze.lru"
+      self."pygments"
+      self."ipaddress"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a4/40/f09d8800bfc3c09bdb6c95f37bb61c890dc62c19c4e7caa304da7aa77403/pyramid_debugtoolbar-4.3.tar.gz";
-      md5 = "9c49029e9f0695130499ef6416ffaaf8";
+      url = "https://files.pythonhosted.org/packages/00/6f/c04eb4e715a7a5a4b24079ab7ffd1dceb1f70b2e24fc17686a2922dbac0a/pyramid_debugtoolbar-4.4.tar.gz";
+      sha256 = "17p7nxvapvy2hab1rah3ndq2kbs4v83pixj8x2n4m7008ai9lxsz";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pyramid-jinja2 = super.buildPythonPackage {
+  "pyramid-jinja2" = super.buildPythonPackage {
     name = "pyramid-jinja2-2.7";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."zope.deprecation"
+      self."jinja2"
+      self."markupsafe"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d8/80/d60a7233823de22ce77bd864a8a83736a1fe8b49884b08303a2e68b2c853/pyramid_jinja2-2.7.tar.gz";
-      md5 = "c2f8b2cd7b73a6f1d9a311fcfaf4fb92";
+      url = "https://files.pythonhosted.org/packages/d8/80/d60a7233823de22ce77bd864a8a83736a1fe8b49884b08303a2e68b2c853/pyramid_jinja2-2.7.tar.gz";
+      sha256 = "1sz5s0pp5jqhf4w22w9527yz8hgdi4mhr6apd6vw1gm5clghh8aw";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  pyramid-mako = super.buildPythonPackage {
+  "pyramid-mako" = super.buildPythonPackage {
     name = "pyramid-mako-1.0.2";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [pyramid Mako];
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."mako"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
-      md5 = "ee25343a97eb76bd90abdc2a774eb48a";
+      url = "https://files.pythonhosted.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
+      sha256 = "18gk2vliq8z4acblsl6yzgbvnr9rlxjlcqir47km7kvlk1xri83d";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  pysqlite = super.buildPythonPackage {
+  "pysqlite" = super.buildPythonPackage {
     name = "pysqlite-2.8.3";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/42/02/981b6703e3c83c5b25a829c6e77aad059f9481b0bbacb47e6e8ca12bd731/pysqlite-2.8.3.tar.gz";
-      md5 = "033f17b8644577715aee55e8832ac9fc";
+      url = "https://files.pythonhosted.org/packages/42/02/981b6703e3c83c5b25a829c6e77aad059f9481b0bbacb47e6e8ca12bd731/pysqlite-2.8.3.tar.gz";
+      sha256 = "1424gwq9sil2ffmnizk60q36vydkv8rxs6m7xs987kz8cdc37lqp";
     };
     meta = {
       license = [ { fullName = "zlib/libpng License"; } { fullName = "zlib/libpng license"; } ];
     };
   };
-  pytest = super.buildPythonPackage {
-    name = "pytest-3.2.5";
-    buildInputs = with self; [];
+  "pytest" = super.buildPythonPackage {
+    name = "pytest-3.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [py setuptools];
+    propagatedBuildInputs = [
+      self."py"
+      self."six"
+      self."setuptools"
+      self."attrs"
+      self."more-itertools"
+      self."atomicwrites"
+      self."pluggy"
+      self."funcsigs"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/1f/f8/8cd74c16952163ce0db0bd95fdd8810cbf093c08be00e6e665ebf0dc3138/pytest-3.2.5.tar.gz";
-      md5 = "6dbe9bb093883f75394a689a1426ac6f";
+      url = "https://files.pythonhosted.org/packages/67/6a/5bcdc22f8dbada1d2910d6e1a3a03f6b14306c78f81122890735b28be4bf/pytest-3.6.0.tar.gz";
+      sha256 = "0bdfazvjjbxssqzyvkb3m2x2in7xv56ipr899l00s87k7815sm9r";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pytest-catchlog = super.buildPythonPackage {
-    name = "pytest-catchlog-1.2.2";
-    buildInputs = with self; [];
+  "pytest-cov" = super.buildPythonPackage {
+    name = "pytest-cov-2.5.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [py pytest];
+    propagatedBuildInputs = [
+      self."pytest"
+      self."coverage"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f2/2b/2faccdb1a978fab9dd0bf31cca9f6847fbe9184a0bdcc3011ac41dd44191/pytest-catchlog-1.2.2.zip";
-      md5 = "09d890c54c7456c818102b7ff8c182c8";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  pytest-cov = super.buildPythonPackage {
-    name = "pytest-cov-2.5.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [pytest coverage];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz";
-      md5 = "5acf38d4909e19819eb5c1754fbfc0ac";
+      url = "https://files.pythonhosted.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz";
+      sha256 = "0bbfpwdh9k3636bxc88vz9fa7vf4akchgn513ql1vd0xy4n7bah3";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.mit ];
     };
   };
-  pytest-profiling = super.buildPythonPackage {
-    name = "pytest-profiling-1.2.11";
-    buildInputs = with self; [];
+  "pytest-profiling" = super.buildPythonPackage {
+    name = "pytest-profiling-1.3.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six pytest gprof2dot];
+    propagatedBuildInputs = [
+      self."six"
+      self."pytest"
+      self."gprof2dot"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c0/4a/b4aa786e93c07a86f1f87c581a36bf355a9e06a9da7e00dbd05047626bd2/pytest-profiling-1.2.11.tar.gz";
-      md5 = "9ef6b60248731be5d44477980408e8f7";
+      url = "https://files.pythonhosted.org/packages/f5/34/4626126e041a51ef50a80d0619519b18d20aef249aac25b0d0fdd47e57ee/pytest-profiling-1.3.0.tar.gz";
+      sha256 = "08r5afx5z22yvpmsnl91l4amsy1yxn8qsmm61mhp06mz8zjs51kb";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pytest-runner = super.buildPythonPackage {
-    name = "pytest-runner-3.0";
-    buildInputs = with self; [];
+  "pytest-runner" = super.buildPythonPackage {
+    name = "pytest-runner-4.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/65/b4/ae89338cd2d81e2cc54bd6db2e962bfe948f612303610d68ab24539ac2d1/pytest-runner-3.0.tar.gz";
-      md5 = "8f8363a52bbabc4cedd5e239beb2ba11";
+      url = "https://files.pythonhosted.org/packages/9e/b7/fe6e8f87f9a756fd06722216f1b6698ccba4d269eac6329d9f0c441d0f93/pytest-runner-4.2.tar.gz";
+      sha256 = "1gkpyphawxz38ni1gdq1fmwyqcg02m7ypzqvv46z06crwdxi2gyj";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pytest-sugar = super.buildPythonPackage {
-    name = "pytest-sugar-0.9.0";
-    buildInputs = with self; [];
+  "pytest-sugar" = super.buildPythonPackage {
+    name = "pytest-sugar-0.9.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [pytest termcolor];
+    propagatedBuildInputs = [
+      self."pytest"
+      self."termcolor"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/49/d8/c5ff6cca3ce2ebd8b73eec89779bf6b4a7737456a70e8ea4d44c1ff90f71/pytest-sugar-0.9.0.tar.gz";
-      md5 = "89fbff17277fa6a95a560a04b68cb9f9";
+      url = "https://files.pythonhosted.org/packages/3e/6a/a3f909083079d03bde11d06ab23088886bbe25f2c97fbe4bb865e2bf05bc/pytest-sugar-0.9.1.tar.gz";
+      sha256 = "0b4av40dv30727m54v211r0nzwjp2ajkjgxix6j484qjmwpw935b";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pytest-timeout = super.buildPythonPackage {
-    name = "pytest-timeout-1.2.0";
-    buildInputs = with self; [];
+  "pytest-timeout" = super.buildPythonPackage {
+    name = "pytest-timeout-1.2.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [pytest];
+    propagatedBuildInputs = [
+      self."pytest"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cc/b7/b2a61365ea6b6d2e8881360ae7ed8dad0327ad2df89f2f0be4a02304deb2/pytest-timeout-1.2.0.tar.gz";
-      md5 = "83607d91aa163562c7ee835da57d061d";
+      url = "https://files.pythonhosted.org/packages/be/e9/a9106b8bc87521c6813060f50f7d1fdc15665bc1bbbe71c0ffc1c571aaa2/pytest-timeout-1.2.1.tar.gz";
+      sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit { fullName = "DFSG approved"; } ];
     };
   };
-  python-dateutil = super.buildPythonPackage {
-    name = "python-dateutil-2.6.1";
-    buildInputs = with self; [];
+  "python-dateutil" = super.buildPythonPackage {
+    name = "python-dateutil-2.7.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [six];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/54/bb/f1db86504f7a49e1d9b9301531181b00a1c7325dc85a29160ee3eaa73a54/python-dateutil-2.6.1.tar.gz";
-      md5 = "db38f6b4511cefd76014745bb0cc45a4";
+      url = "https://files.pythonhosted.org/packages/a0/b0/a4e3241d2dee665fea11baec21389aec6886655cd4db7647ddf96c3fad15/python-dateutil-2.7.3.tar.gz";
+      sha256 = "1f7h54lg0w2ckch7592xpjkh8dg87k2br256h0iw49zn6bg02w72";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "Simplified BSD"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 { fullName = "Dual License"; } ];
     };
   };
-  python-editor = super.buildPythonPackage {
+  "python-editor" = super.buildPythonPackage {
     name = "python-editor-1.0.3";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/65/1e/adf6e000ea5dc909aa420352d6ba37f16434c8a3c2fa030445411a1ed545/python-editor-1.0.3.tar.gz";
-      md5 = "0aca5f2ef176ce68e98a5b7e31372835";
+      url = "https://files.pythonhosted.org/packages/65/1e/adf6e000ea5dc909aa420352d6ba37f16434c8a3c2fa030445411a1ed545/python-editor-1.0.3.tar.gz";
+      sha256 = "0rf5xz8vw93v7mhdcvind7fkykipzga430wkcd7wk892xsn6dh53";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 { fullName = "Apache"; } ];
     };
   };
-  python-ldap = super.buildPythonPackage {
-    name = "python-ldap-2.4.45";
-    buildInputs = with self; [];
+  "python-ldap" = super.buildPythonPackage {
+    name = "python-ldap-3.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."pyasn1"
+      self."pyasn1-modules"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ce/52/6b5372d0166820f4a4b0a88ed73dc7504219355049fc1d266d8ccdb7942e/python-ldap-2.4.45.tar.gz";
-      md5 = "6108e189a44eea8bc7d1cc281c222978";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.psfl ];
-    };
-  };
-  python-memcached = super.buildPythonPackage {
-    name = "python-memcached-1.58";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [six];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f7/62/14b2448cfb04427366f24104c9da97cf8ea380d7258a3233f066a951a8d8/python-memcached-1.58.tar.gz";
-      md5 = "23b258105013d14d899828d334e6b044";
+      url = "https://files.pythonhosted.org/packages/7f/1c/28d721dff2fcd2fef9d55b40df63a00be26ec8a11e8c6fc612ae642f9cfd/python-ldap-3.1.0.tar.gz";
+      sha256 = "1i97nwfnraylyn0myxlf3vciicrf5h6fymrcff9c00k581wmx5s1";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  python-pam = super.buildPythonPackage {
-    name = "python-pam-1.8.2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/de/8c/f8f5d38b4f26893af267ea0b39023d4951705ab0413a39e0cf7cf4900505/python-pam-1.8.2.tar.gz";
-      md5 = "db71b6b999246fb05d78ecfbe166629d";
-    };
-    meta = {
-      license = [ { fullName = "License :: OSI Approved :: MIT License"; } pkgs.lib.licenses.mit ];
-    };
-  };
-  pytz = super.buildPythonPackage {
-    name = "pytz-2018.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/1b/50/4cdc62fc0753595fc16c8f722a89740f487c6e5670c644eb8983946777be/pytz-2018.3.tar.gz";
-      md5 = "abb07c09c79f78d7c04f222a550c99ef";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  pyzmq = super.buildPythonPackage {
-    name = "pyzmq-14.6.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/8a/3b/5463d5a9d712cd8bbdac335daece0d69f6a6792da4e3dd89956c0db4e4e6/pyzmq-14.6.0.tar.gz";
-      md5 = "395b5de95a931afa5b14c9349a5b8024";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "LGPL+BSD"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
-    };
-  };
-  redis = super.buildPythonPackage {
-    name = "redis-2.10.6";
-    buildInputs = with self; [];
+  "python-memcached" = super.buildPythonPackage {
+    name = "python-memcached-1.59";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/09/8d/6d34b75326bf96d4139a2ddd8e74b80840f800a0a79f9294399e212cb9a7/redis-2.10.6.tar.gz";
-      md5 = "048348d8cfe0b5d0bba2f4d835005c3b";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  repoze.lru = super.buildPythonPackage {
-    name = "repoze.lru-0.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/12/bc/595a77c4b5e204847fdf19268314ef59c85193a9dc9f83630fc459c0fee5/repoze.lru-0.7.tar.gz";
-      md5 = "c08cc030387e0b1fc53c5c7d964b35e2";
-    };
-    meta = {
-      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-    };
-  };
-  requests = super.buildPythonPackage {
-    name = "requests-2.9.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f9/6d/07c44fb1ebe04d069459a189e7dab9e4abfe9432adcd4477367c25332748/requests-2.9.1.tar.gz";
-      md5 = "0b7f480d19012ec52bab78292efd976d";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
-    };
-  };
-  rhodecode-enterprise-ce = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.12.4";
-    buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj];
-    doCheck = true;
-    propagatedBuildInputs = with self; [setuptools-scm amqp authomatic Babel Beaker celery Chameleon channelstream click colander configobj cssselect decorator deform docutils dogpile.cache dogpile.core ecdsa FormEncode future futures gnureadline infrae.cache iso8601 itsdangerous Jinja2 billiard kombu lxml Mako Markdown MarkupSafe msgpack-python MySQL-python objgraph packaging Paste PasteDeploy PasteScript pathlib2 peppercorn psutil psycopg2 py-bcrypt pycrypto pycurl pyflakes pygments-markdown-lexer Pygments pyparsing pyramid-beaker pyramid-debugtoolbar pyramid-jinja2 pyramid-mako pyramid pysqlite python-dateutil python-ldap python-memcached python-pam pytz tzlocal pyzmq py-gfm redis repoze.lru requests Routes setproctitle simplejson six SQLAlchemy sshpubkeys subprocess32 supervisor Tempita translationstring trollius urllib3 URLObject venusian WebError WebHelpers2 WebHelpers WebOb Whoosh wsgiref zope.cachedescriptors zope.deprecation zope.event zope.interface nbconvert bleach nbformat jupyter-client alembic invoke bumpversion transifex-client gevent greenlet gunicorn waitress uWSGI ipdb ipython CProfileV bottle rhodecode-tools appenlight-client pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
-    src = ./.;
-    meta = {
-      license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
-    };
-  };
-  rhodecode-tools = super.buildPythonPackage {
-    name = "rhodecode-tools-0.14.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests elasticsearch elasticsearch-dsl urllib3 Whoosh];
-    src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.14.1.tar.gz?md5=0b9c2caad160b68889f8172ea54af7b2";
-      md5 = "0b9c2caad160b68889f8172ea54af7b2";
-    };
-    meta = {
-      license = [ { fullName = "AGPLv3 and Proprietary"; } ];
-    };
-  };
-  scandir = super.buildPythonPackage {
-    name = "scandir-1.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/13/bb/e541b74230bbf7a20a3949a2ee6631be299378a784f5445aa5d0047c192b/scandir-1.7.tar.gz";
-      md5 = "037e5f24d1a0e78b17faca72dea9555f";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
-    };
-  };
-  setproctitle = super.buildPythonPackage {
-    name = "setproctitle-1.1.10";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3/setproctitle-1.1.10.tar.gz";
-      md5 = "2dcdd1b761700a5a13252fea3dfd1977";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  setuptools = super.buildPythonPackage {
-    name = "setuptools-30.1.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/1e/43/002c8616db9a3e7be23c2556e39b90a32bb40ba0dc652de1999d5334d372/setuptools-30.1.0.tar.gz";
-      md5 = "cac497f42e5096ac8df29e38d3f81c3e";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  setuptools-scm = super.buildPythonPackage {
-    name = "setuptools-scm-1.15.6";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/03/6d/aafdd01edd227ee879b691455bf19895091872af7e48192bea1758c82032/setuptools_scm-1.15.6.tar.gz";
-      md5 = "f17493d53f0d842bb0152f214775640b";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  simplegeneric = super.buildPythonPackage {
-    name = "simplegeneric-0.8.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
-      md5 = "f9c1fab00fd981be588fc32759f474e3";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
-    };
-  };
-  simplejson = super.buildPythonPackage {
-    name = "simplejson-3.11.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/08/48/c97b668d6da7d7bebe7ea1817a6f76394b0ec959cb04214ca833c34359df/simplejson-3.11.1.tar.gz";
-      md5 = "6e2f1bd5fb0a926facf5d89d217a7183";
-    };
-    meta = {
-      license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ];
-    };
-  };
-  six = super.buildPythonPackage {
-    name = "six-1.11.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
-      md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  sshpubkeys = super.buildPythonPackage {
-    name = "sshpubkeys-2.2.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [pycrypto ecdsa];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/27/da/337fabeb3dca6b62039a93ceaa636f25065e0ae92b575b1235342076cf0a/sshpubkeys-2.2.0.tar.gz";
-      md5 = "458e45f6b92b1afa84f0ffe1f1c90935";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  subprocess32 = super.buildPythonPackage {
-    name = "subprocess32-3.2.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/b8/2f/49e53b0d0e94611a2dc624a1ad24d41b6d94d0f1b0a078443407ea2214c2/subprocess32-3.2.7.tar.gz";
-      md5 = "824c801e479d3e916879aae3e9c15e16";
+      url = "https://files.pythonhosted.org/packages/90/59/5faf6e3cd8a568dd4f737ddae4f2e54204fd8c51f90bf8df99aca6c22318/python-memcached-1.59.tar.gz";
+      sha256 = "0kvyapavbirk2x3n1jx4yb9nyigrj1s3x15nm3qhpvhkpqvqdqm2";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  supervisor = super.buildPythonPackage {
-    name = "supervisor-3.3.4";
-    buildInputs = with self; [];
+  "python-pam" = super.buildPythonPackage {
+    name = "python-pam-1.8.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [meld3];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/44/60/698e54b4a4a9b956b2d709b4b7b676119c833d811d53ee2500f1b5e96dc3/supervisor-3.3.4.tar.gz";
-      md5 = "f1814d71d820ddfa8c86d46a72314cec";
+      url = "https://files.pythonhosted.org/packages/01/16/544d01cae9f28e0292dbd092b6b8b0bf222b528f362ee768a5bed2140111/python-pam-1.8.4.tar.gz";
+      sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8";
+    };
+    meta = {
+      license = [ { fullName = "License :: OSI Approved :: MIT License"; } pkgs.lib.licenses.mit ];
+    };
+  };
+  "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";
     };
     meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  termcolor = super.buildPythonPackage {
-    name = "termcolor-1.1.0";
-    buildInputs = with self; [];
+  "pyzmq" = super.buildPythonPackage {
+    name = "pyzmq-14.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz";
-      md5 = "043e89644f8909d462fbbfa511c768df";
+      url = "https://files.pythonhosted.org/packages/8a/3b/5463d5a9d712cd8bbdac335daece0d69f6a6792da4e3dd89956c0db4e4e6/pyzmq-14.6.0.tar.gz";
+      sha256 = "1frmbjykvhmdg64g7sn20c9fpamrsfxwci1nhhg8q7jgz5pq0ikp";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "LGPL+BSD"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
+    };
+  };
+  "redis" = super.buildPythonPackage {
+    name = "redis-2.10.6";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/09/8d/6d34b75326bf96d4139a2ddd8e74b80840f800a0a79f9294399e212cb9a7/redis-2.10.6.tar.gz";
+      sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  testpath = super.buildPythonPackage {
-    name = "testpath-0.3.1";
-    buildInputs = with self; [];
+  "repoze.lru" = super.buildPythonPackage {
+    name = "repoze.lru-0.7";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/12/bc/595a77c4b5e204847fdf19268314ef59c85193a9dc9f83630fc459c0fee5/repoze.lru-0.7.tar.gz";
+      sha256 = "0xzz1aw2smy8hdszrq8yhnklx6w1r1mf55061kalw3iq35gafa84";
+    };
+    meta = {
+      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
+  "requests" = super.buildPythonPackage {
+    name = "requests-2.9.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/8b/b71e9ee10e5f751e9d959bc750ab122ba04187f5aa52aabdc4e63b0e31a7/testpath-0.3.1.tar.gz";
-      md5 = "2cd5ed5522fda781bb497c9d80ae2fc9";
+      url = "https://files.pythonhosted.org/packages/f9/6d/07c44fb1ebe04d069459a189e7dab9e4abfe9432adcd4477367c25332748/requests-2.9.1.tar.gz";
+      sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "rhodecode-enterprise-ce" = super.buildPythonPackage {
+    name = "rhodecode-enterprise-ce-4.13.0";
+    buildInputs = [
+      self."pytest"
+      self."py"
+      self."pytest-cov"
+      self."pytest-sugar"
+      self."pytest-runner"
+      self."pytest-profiling"
+      self."gprof2dot"
+      self."pytest-timeout"
+      self."mock"
+      self."webtest"
+      self."cov-core"
+      self."coverage"
+      self."configobj"
+    ];
+    doCheck = true;
+    propagatedBuildInputs = [
+      self."setuptools-scm"
+      self."amqp"
+      self."authomatic"
+      self."babel"
+      self."beaker"
+      self."celery"
+      self."chameleon"
+      self."channelstream"
+      self."click"
+      self."colander"
+      self."configobj"
+      self."cssselect"
+      self."decorator"
+      self."deform"
+      self."docutils"
+      self."dogpile.cache"
+      self."dogpile.core"
+      self."ecdsa"
+      self."formencode"
+      self."future"
+      self."futures"
+      self."gnureadline"
+      self."infrae.cache"
+      self."iso8601"
+      self."itsdangerous"
+      self."jinja2"
+      self."billiard"
+      self."kombu"
+      self."lxml"
+      self."mako"
+      self."markdown"
+      self."markupsafe"
+      self."msgpack-python"
+      self."mysql-python"
+      self."pymysql"
+      self."pyotp"
+      self."objgraph"
+      self."packaging"
+      self."paste"
+      self."pastedeploy"
+      self."pastescript"
+      self."pathlib2"
+      self."peppercorn"
+      self."psutil"
+      self."psycopg2"
+      self."py-bcrypt"
+      self."pycrypto"
+      self."pycurl"
+      self."pyflakes"
+      self."pygments-markdown-lexer"
+      self."pygments"
+      self."pyparsing"
+      self."pyramid-beaker"
+      self."pyramid-debugtoolbar"
+      self."pyramid-jinja2"
+      self."pyramid-mako"
+      self."pyramid"
+      self."pysqlite"
+      self."python-dateutil"
+      self."python-ldap"
+      self."python-memcached"
+      self."python-pam"
+      self."pytz"
+      self."tzlocal"
+      self."pyzmq"
+      self."py-gfm"
+      self."redis"
+      self."repoze.lru"
+      self."requests"
+      self."routes"
+      self."setproctitle"
+      self."simplejson"
+      self."six"
+      self."sqlalchemy"
+      self."sshpubkeys"
+      self."subprocess32"
+      self."supervisor"
+      self."tempita"
+      self."translationstring"
+      self."trollius"
+      self."urllib3"
+      self."urlobject"
+      self."venusian"
+      self."weberror"
+      self."webhelpers2"
+      self."webhelpers"
+      self."webob"
+      self."whoosh"
+      self."wsgiref"
+      self."zope.cachedescriptors"
+      self."zope.deprecation"
+      self."zope.event"
+      self."zope.interface"
+      self."nbconvert"
+      self."bleach"
+      self."nbformat"
+      self."jupyter-client"
+      self."alembic"
+      self."invoke"
+      self."bumpversion"
+      self."gevent"
+      self."greenlet"
+      self."gunicorn"
+      self."waitress"
+      self."ipdb"
+      self."ipython"
+      self."cprofilev"
+      self."bottle"
+      self."rhodecode-tools"
+      self."appenlight-client"
+      self."pytest"
+      self."py"
+      self."pytest-cov"
+      self."pytest-sugar"
+      self."pytest-runner"
+      self."pytest-profiling"
+      self."gprof2dot"
+      self."pytest-timeout"
+      self."mock"
+      self."webtest"
+      self."cov-core"
+      self."coverage"
+    ];
+    src = ./.;
+    meta = {
+      license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
+    };
+  };
+  "rhodecode-tools" = super.buildPythonPackage {
+    name = "rhodecode-tools-0.16.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."click"
+      self."future"
+      self."six"
+      self."mako"
+      self."markupsafe"
+      self."requests"
+      self."elasticsearch"
+      self."elasticsearch-dsl"
+      self."urllib3"
+      self."whoosh"
+    ];
+    src = fetchurl {
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164";
+      sha256 = "00xcc2mj99lx9d0ksml0p2xrd00kf5ypwyigg58cc9j9bznx7mzr";
+    };
+    meta = {
+      license = [ { fullName = "AGPLv3 and Proprietary"; } ];
+    };
+  };
+  "routes" = super.buildPythonPackage {
+    name = "routes-2.4.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."six"
+      self."repoze.lru"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/33/38/ea827837e68d9c7dde4cff7ec122a93c319f0effc08ce92a17095576603f/Routes-2.4.1.tar.gz";
+      sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  traitlets = super.buildPythonPackage {
-    name = "traitlets-4.3.2";
-    buildInputs = with self; [];
+  "scandir" = super.buildPythonPackage {
+    name = "scandir-1.9.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [ipython-genutils six decorator enum34];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069/traitlets-4.3.2.tar.gz";
-      md5 = "3068663f2f38fd939a9eb3a500ccc154";
+      url = "https://files.pythonhosted.org/packages/16/2a/557af1181e6b4e30254d5a6163b18f5053791ca66e251e77ab08887e8fe3/scandir-1.9.0.tar.gz";
+      sha256 = "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
+    };
+  };
+  "setproctitle" = super.buildPythonPackage {
+    name = "setproctitle-1.1.10";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3/setproctitle-1.1.10.tar.gz";
+      sha256 = "163kplw9dcrw0lffq1bvli5yws3rngpnvrxrzdw89pbphjjvg0v2";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  transifex-client = super.buildPythonPackage {
-    name = "transifex-client-0.12.5";
-    buildInputs = with self; [];
+  "setuptools" = super.buildPythonPackage {
+    name = "setuptools-40.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [urllib3 six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/7b/86/60f31a0c9b8d0b1266ce15b6c80b55f88522140c8acfc395d5aec5e23475/transifex-client-0.12.5.tar.gz";
-      md5 = "e6e278117b23f60702c06e203b7e51ae";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.gpl2 ];
-    };
-  };
-  translationstring = super.buildPythonPackage {
-    name = "translationstring-1.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
-      md5 = "a4b62e0f3c189c783a1685b3027f7c90";
+      url = "https://files.pythonhosted.org/packages/5a/df/b2e3d9693bb0dcbeac516a73dd7a9eb82b126ae52e4a74605a9b01beddd5/setuptools-40.1.0.zip";
+      sha256 = "0w1blx5ajga5y15dci0mddk49cf2xpq0mp7rp7jrqr2diqk00ib6";
     };
     meta = {
-      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  trollius = super.buildPythonPackage {
-    name = "trollius-1.0.4";
-    buildInputs = with self; [];
+  "setuptools-scm" = super.buildPythonPackage {
+    name = "setuptools-scm-2.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [futures];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/aa/e6/4141db437f55e6ee7a3fb69663239e3fde7841a811b4bef293145ad6c836/trollius-1.0.4.tar.gz";
-      md5 = "3631a464d49d0cbfd30ab2918ef2b783";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
-    };
-  };
-  tzlocal = super.buildPythonPackage {
-    name = "tzlocal-1.5.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [pytz];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/cb/89/e3687d3ed99bc882793f82634e9824e62499fdfdc4b1ae39e211c5b05017/tzlocal-1.5.1.tar.gz";
-      md5 = "4553be891efa0812c4adfb0c6e818eec";
+      url = "https://files.pythonhosted.org/packages/e5/62/f9e1ac314464eb5945c97542acb6bf6f3381dfa5d7a658de7730c36f31a1/setuptools_scm-2.1.0.tar.gz";
+      sha256 = "0yb364cgk15sfw3x8ln4ssh98z1dj6n8iiz4r2rw1cfsxhgi8rx7";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  uWSGI = super.buildPythonPackage {
-    name = "uWSGI-2.0.15";
-    buildInputs = with self; [];
+  "simplegeneric" = super.buildPythonPackage {
+    name = "simplegeneric-0.8.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bb/0a/45e5aa80dc135889594bb371c082d20fb7ee7303b174874c996888cc8511/uwsgi-2.0.15.tar.gz";
-      md5 = "fc50bd9e83b7602fa474b032167010a7";
+      url = "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
+      sha256 = "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 ];
+    };
+  };
+  "simplejson" = super.buildPythonPackage {
+    name = "simplejson-3.11.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/08/48/c97b668d6da7d7bebe7ea1817a6f76394b0ec959cb04214ca833c34359df/simplejson-3.11.1.tar.gz";
+      sha256 = "1rr58dppsq73p0qcd9bsw066cdd3v63sqv7j6sqni8frvm4jv8h1";
     };
     meta = {
-      license = [ pkgs.lib.licenses.gpl2 ];
+      license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ];
     };
   };
-  urllib3 = super.buildPythonPackage {
-    name = "urllib3-1.16";
-    buildInputs = with self; [];
+  "six" = super.buildPythonPackage {
+    name = "six-1.11.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/3b/f0/e763169124e3f5db0926bc3dbfcd580a105f9ca44cf5d8e6c7a803c9f6b5/urllib3-1.16.tar.gz";
-      md5 = "fcaab1c5385c57deeb7053d3d7d81d59";
+      url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "sqlalchemy" = super.buildPythonPackage {
+    name = "sqlalchemy-1.1.18";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/cc/4d/96d93ff77cd67aca7618e402191eee3490d8f5f245d6ab7622d35fe504f4/SQLAlchemy-1.1.18.tar.gz";
+      sha256 = "1ab4ysip6irajfbxl9wy27kv76miaz8h6759hfx92499z4dcf3lb";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  venusian = super.buildPythonPackage {
-    name = "venusian-1.1.0";
-    buildInputs = with self; [];
+  "sshpubkeys" = super.buildPythonPackage {
+    name = "sshpubkeys-2.2.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."pycrypto"
+      self."ecdsa"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/38/24/b4b470ab9e0a2e2e9b9030c7735828c8934b4c6b45befd1bb713ec2aeb2d/venusian-1.1.0.tar.gz";
-      md5 = "56bc5e6756e4bda37bcdb94f74a72b8f";
-    };
-    meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-    };
-  };
-  vine = super.buildPythonPackage {
-    name = "vine-1.1.4";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/32/23/36284986e011f3c130d802c3c66abd8f1aef371eae110ddf80c5ae22e1ff/vine-1.1.4.tar.gz";
-      md5 = "9fdb971e7fd15b181b84f3bfcf20d11c";
+      url = "https://files.pythonhosted.org/packages/27/da/337fabeb3dca6b62039a93ceaa636f25065e0ae92b575b1235342076cf0a/sshpubkeys-2.2.0.tar.gz";
+      sha256 = "0r4kpwzmg96a2x56pllik7dmc3fnqk189v3sfgsi07q2ryrhr6xm";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  waitress = super.buildPythonPackage {
-    name = "waitress-1.1.0";
-    buildInputs = with self; [];
+  "subprocess32" = super.buildPythonPackage {
+    name = "subprocess32-3.5.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
-      md5 = "0f1eb7fdfdbf2e6d18decbda1733045c";
+      url = "https://files.pythonhosted.org/packages/de/fb/fd3e91507021e2aecdb081d1b920082628d6b8869ead845e3e87b3d2e2ca/subprocess32-3.5.1.tar.gz";
+      sha256 = "0wgi3bfnssid1g6h0v803z3k1wjal6il16nr3r9c587cfzwfkv0q";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.psfl ];
+    };
+  };
+  "supervisor" = super.buildPythonPackage {
+    name = "supervisor-3.3.4";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."meld3"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/44/60/698e54b4a4a9b956b2d709b4b7b676119c833d811d53ee2500f1b5e96dc3/supervisor-3.3.4.tar.gz";
+      sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
+    };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  wcwidth = super.buildPythonPackage {
-    name = "wcwidth-0.1.7";
-    buildInputs = with self; [];
+  "tempita" = super.buildPythonPackage {
+    name = "tempita-0.5.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz";
-      md5 = "b3b6a0a08f0c8a34d1de8cf44150a4ad";
+      url = "https://files.pythonhosted.org/packages/56/c8/8ed6eee83dbddf7b0fc64dd5d4454bc05e6ccaafff47991f73f2894d9ff4/Tempita-0.5.2.tar.gz";
+      sha256 = "177wwq45slfyajd8csy477bmdmzipyw0dm7i85k3akb7m85wzkna";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "termcolor" = super.buildPythonPackage {
+    name = "termcolor-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz";
+      sha256 = "0fv1vq14rpqwgazxg4981904lfyp84mnammw7y046491cv76jv8x";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  webencodings = super.buildPythonPackage {
-    name = "webencodings-0.5.1";
-    buildInputs = with self; [];
+  "testpath" = super.buildPythonPackage {
+    name = "testpath-0.3.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/f4/8b/b71e9ee10e5f751e9d959bc750ab122ba04187f5aa52aabdc4e63b0e31a7/testpath-0.3.1.tar.gz";
+      sha256 = "02bnmkvm6a8a1p5kcygylcd19v2s040qw3zp1n8ab3bqkj1kflqd";
+    };
+    meta = {
+      license = [  ];
+    };
+  };
+  "traitlets" = super.buildPythonPackage {
+    name = "traitlets-4.3.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."ipython-genutils"
+      self."six"
+      self."decorator"
+      self."enum34"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069/traitlets-4.3.2.tar.gz";
+      sha256 = "0dbq7sx26xqz5ixs711k5nc88p8a0nqyz6162pwks5dpcz9d4jww";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "translationstring" = super.buildPythonPackage {
+    name = "translationstring-1.3";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
+      sha256 = "0bdpcnd9pv0131dl08h4zbcwmgc45lyvq3pa224xwan5b3x4rr2f";
+    };
+    meta = {
+      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+    };
+  };
+  "trollius" = super.buildPythonPackage {
+    name = "trollius-1.0.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."futures"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/aa/e6/4141db437f55e6ee7a3fb69663239e3fde7841a811b4bef293145ad6c836/trollius-1.0.4.tar.gz";
+      sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "tzlocal" = super.buildPythonPackage {
+    name = "tzlocal-1.5.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pytz"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/cb/89/e3687d3ed99bc882793f82634e9824e62499fdfdc4b1ae39e211c5b05017/tzlocal-1.5.1.tar.gz";
+      sha256 = "0kiciwiqx0bv0fbc913idxibc4ygg4cb7f8rcpd9ij2shi4bigjf";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "urllib3" = super.buildPythonPackage {
+    name = "urllib3-1.21";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz";
-      md5 = "32f6e261d52e57bf7e1c4d41546d15b8";
+      url = "https://files.pythonhosted.org/packages/34/95/7b28259d0006ed681c424cd71a668363265eac92b67dddd018eb9a22bff8/urllib3-1.21.tar.gz";
+      sha256 = "0irnj4wvh2y36s4q3l2vas9qr9m766w6w418nb490j3mf8a8zw6h";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "urlobject" = super.buildPythonPackage {
+    name = "urlobject-2.4.3";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/e2/b8/1d0a916f4b34c4618846e6da0e4eeaa8fcb4a2f39e006434fe38acb74b34/URLObject-2.4.3.tar.gz";
+      sha256 = "1ahc8ficzfvr2avln71immfh4ls0zyv6cdaa5xmkdj5rd87f5cj7";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.publicDomain ];
+    };
+  };
+  "venusian" = super.buildPythonPackage {
+    name = "venusian-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/38/24/b4b470ab9e0a2e2e9b9030c7735828c8934b4c6b45befd1bb713ec2aeb2d/venusian-1.1.0.tar.gz";
+      sha256 = "0zapz131686qm0gazwy8bh11vr57pr89jbwbl50s528sqy9f80lr";
+    };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
+  "vine" = super.buildPythonPackage {
+    name = "vine-1.1.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/32/23/36284986e011f3c130d802c3c66abd8f1aef371eae110ddf80c5ae22e1ff/vine-1.1.4.tar.gz";
+      sha256 = "0wkskb2hb494v9gixqnf4bl972p4ibcmxdykzpwjlfa5picns4aj";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  ws4py = super.buildPythonPackage {
-    name = "ws4py-0.4.3";
-    buildInputs = with self; [];
+  "waitress" = super.buildPythonPackage {
+    name = "waitress-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
+      sha256 = "1a85gyji0kajc3p0s1pwwfm06w4wfxjkvvl4rnrz3h164kbd6g6k";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 ];
+    };
+  };
+  "wcwidth" = super.buildPythonPackage {
+    name = "wcwidth-0.1.7";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz";
+      sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "webencodings" = super.buildPythonPackage {
+    name = "webencodings-0.5.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/a1/33c43a4304ac3b4dc81deb93cbd329de9297dd034d75c47cce64fda806bc/ws4py-0.4.3.tar.gz";
-      md5 = "d5834cf7d3965bb0da31bbb02bd8513a";
+      url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz";
+      sha256 = "08qrgrc4hrximb2gqnl69g01s93rhf2842jfxdjljc1dbwj1qsmk";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "weberror" = super.buildPythonPackage {
+    name = "weberror-0.10.3";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."webob"
+      self."tempita"
+      self."pygments"
+      self."paste"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/35/76/e7e5c2ce7e9c7f31b54c1ff295a495886d1279a002557d74dd8957346a79/WebError-0.10.3.tar.gz";
+      sha256 = "0frg4kvycqpj5bi8asfqfs6bxsr2cvjvb6b56c4d1ai1z57kbjx6";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "webhelpers" = super.buildPythonPackage {
+    name = "webhelpers-1.3";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."markupsafe"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ee/68/4d07672821d514184357f1552f2dad923324f597e722de3b016ca4f7844f/WebHelpers-1.3.tar.gz";
+      sha256 = "10x5i82qdkrvyw18gsybwggfhfpl869siaab89vnndi9x62g51pa";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  wsgiref = super.buildPythonPackage {
-    name = "wsgiref-0.1.2";
-    buildInputs = with self; [];
+  "webhelpers2" = super.buildPythonPackage {
+    name = "webhelpers2-2.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."markupsafe"
+      self."six"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ff/30/56342c6ea522439e3662427c8d7b5e5b390dff4ff2dc92d8afcb8ab68b75/WebHelpers2-2.0.tar.gz";
+      sha256 = "0aphva1qmxh83n01p53f5fd43m4srzbnfbz5ajvbx9aj2aipwmcs";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "webob" = super.buildPythonPackage {
+    name = "webob-1.7.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/75/34/731e23f52371852dfe7490a61644826ba7fe70fd52a377aaca0f4956ba7f/WebOb-1.7.4.tar.gz";
+      sha256 = "1na01ljg04z40il7vcrn8g29vaw7nvg1xvhk64cr4jys5wcay44d";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "webtest" = super.buildPythonPackage {
+    name = "webtest-2.0.29";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."webob"
+      self."waitress"
+      self."beautifulsoup4"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz";
+      sha256 = "0bcj1ica5lnmj5zbvk46x28kgphcsgh7sfnwjmn0cr94mhawrg6v";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "whoosh" = super.buildPythonPackage {
+    name = "whoosh-2.7.4";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/41/9e/309259ce8dff8c596e8c26df86dbc4e848b9249fd36797fd60be456f03fc/wsgiref-0.1.2.zip";
-      md5 = "29b146e6ebd0f9fb119fe321f7bcf6cb";
+      url = "https://files.pythonhosted.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/Whoosh-2.7.4.tar.gz";
+      sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.bsd2 ];
+    };
+  };
+  "ws4py" = super.buildPythonPackage {
+    name = "ws4py-0.5.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/53/20/4019a739b2eefe9282d3822ef6a225250af964b117356971bd55e274193c/ws4py-0.5.1.tar.gz";
+      sha256 = "10slbbf2jm4hpr92jx7kh7mhf48sjl01v2w4d8z3f1p0ybbp7l19";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "wsgiref" = super.buildPythonPackage {
+    name = "wsgiref-0.1.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/41/9e/309259ce8dff8c596e8c26df86dbc4e848b9249fd36797fd60be456f03fc/wsgiref-0.1.2.zip";
+      sha256 = "0y8fyjmpq7vwwm4x732w97qbkw78rjwal5409k04cw4m03411rn7";
     };
     meta = {
       license = [ { fullName = "PSF or ZPL"; } ];
     };
   };
-  zope.cachedescriptors = super.buildPythonPackage {
+  "zope.cachedescriptors" = super.buildPythonPackage {
     name = "zope.cachedescriptors-4.3.1";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2f/89/ebe1890cc6d3291ebc935558fa764d5fffe571018dbbee200e9db78762cb/zope.cachedescriptors-4.3.1.tar.gz";
-      md5 = "42f3693f43bc93f3b1eb86940f58acf3";
+      url = "https://files.pythonhosted.org/packages/2f/89/ebe1890cc6d3291ebc935558fa764d5fffe571018dbbee200e9db78762cb/zope.cachedescriptors-4.3.1.tar.gz";
+      sha256 = "0jhr3m5p74c6r7k8iv0005b8bfsialih9d7zl5vx38rf5xq1lk8z";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
-  zope.deprecation = super.buildPythonPackage {
+  "zope.deprecation" = super.buildPythonPackage {
     name = "zope.deprecation-4.3.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a1/18/2dc5e6bfe64fdc3b79411b67464c55bb0b43b127051a20f7f492ab767758/zope.deprecation-4.3.0.tar.gz";
-      md5 = "2166b2cb7e0e96a21104e6f8f9b696bb";
+      url = "https://files.pythonhosted.org/packages/a1/18/2dc5e6bfe64fdc3b79411b67464c55bb0b43b127051a20f7f492ab767758/zope.deprecation-4.3.0.tar.gz";
+      sha256 = "095jas41wbxgmw95kwdxqhbc3bgihw2hzj9b3qpdg85apcsf2lkx";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
-  zope.event = super.buildPythonPackage {
+  "zope.event" = super.buildPythonPackage {
     name = "zope.event-4.3.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9e/d0/54ba59f19a0635f6591b74be259cf6fbf67e73f4edda27b5cd0cf4d26efa/zope.event-4.3.0.tar.gz";
-      md5 = "8ca737960741c6fd112972f3313303bd";
+      url = "https://files.pythonhosted.org/packages/9e/d0/54ba59f19a0635f6591b74be259cf6fbf67e73f4edda27b5cd0cf4d26efa/zope.event-4.3.0.tar.gz";
+      sha256 = "1rrkyx42bcq8dkpj23c2v99kczlrg8d39c06q5qpr0vs4hjfmv70";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
-  zope.interface = super.buildPythonPackage {
-    name = "zope.interface-4.4.3";
-    buildInputs = with self; [];
+  "zope.interface" = super.buildPythonPackage {
+    name = "zope.interface-4.5.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bd/d2/25349ed41f9dcff7b3baf87bd88a4c82396cf6e02f1f42bb68657a3132af/zope.interface-4.4.3.tar.gz";
-      md5 = "8700a4f527c1203b34b10c2b4e7a6912";
+      url = "https://files.pythonhosted.org/packages/ac/8a/657532df378c2cd2a1fe6b12be3b4097521570769d4852ec02c24bd3594e/zope.interface-4.5.0.tar.gz";
+      sha256 = "0k67m60ij06wkg82n15qgyn96waf4pmrkhv0njpkfzpmv5q89hsp";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
 

pytest.ini

@@ -1,6 +1,7 b''
 [pytest]
 testpaths = rhodecode
 norecursedirs = rhodecode/public rhodecode/templates tests/scripts
+cache_dir = /tmp/.pytest_cache
 
 pyramid_config = rhodecode/tests/rhodecode.ini
 vcsserver_protocol = http

release.nix

@@ -1,232 +1,21 b''
-#
-# About
-# =====
-#
-# This file defines jobs for our CI system and the attribute "build" is used
-# as the input for packaging.
-#
-#
-# CI details
-# ==========
-#
-# This file defines an attribute set of derivations. Each of these attributes is
-# then used in our CI system as one job to run. This way we keep the
-# configuration for the CI jobs as well under version control.
-#
-# Run CI jobs locally
-# -------------------
-#
-# Since it is all based on normal Nix derivations, the jobs can be tested
-# locally with a run of "nix-build" like the following example:
-#
-#    nix-build release.nix -A test-api -I vcsserver=~/rhodecode-vcsserver
-#
-# Note: Replace "~/rhodecode-vcsserver" with a path where a clone of the
-# vcsserver resides.
+# This file defines how to "build" for packaging.
 
 { pkgs ? import <nixpkgs> {}
-, doCheck ? true
+, doCheck ? false
 }:
 
 let
-
-  inherit (pkgs)
-    stdenv
-    system;
-
-  testing = import <nixpkgs/nixos/lib/testing.nix> {
-    inherit system;
-  };
-
-  runInMachine = testing.runInMachine;
-
-  sphinx = import ./docs/default.nix {};
-
-  mkDocs = kind: stdenv.mkDerivation {
-    name = kind;
-    srcs = [
-      (./. + (builtins.toPath "/${kind}"))
-      (builtins.filterSource
-        (path: type: baseNameOf path == "VERSION")
-        ./rhodecode)
-    ];
-    sourceRoot = kind;
-    buildInputs = [ sphinx ];
-    configurePhase = null;
-    buildPhase = ''
-      make SPHINXBUILD=sphinx-build html
-    '';
-    installPhase = ''
-      mkdir -p $out
-      mv _build/html $out/
-
-      mkdir -p $out/nix-support
-      echo "doc manual $out/html index.html" >> \
-        "$out/nix-support/hydra-build-products"
-    '';
-  };
-
-  enterprise = import ./default.nix {
+  enterprise_ce = import ./default.nix {
     inherit
+      doCheck
       pkgs;
 
-    # TODO: for quick local testing
-    doCheck = false;
-  };
+    # disable checkPhase for build
+    checkPhase = ''
+    '';
 
-  test-cfg = stdenv.mkDerivation {
-    name = "test-cfg";
-    unpackPhase = "true";
-    buildInputs = [
-      enterprise.src
-    ];
-    installPhase = ''
-      mkdir -p $out/etc
-      cp ${enterprise.src}/test.ini $out/etc/enterprise.ini
-      # TODO: johbo: Needed, so that the login works, this causes
-      # probably some side effects
-      substituteInPlace $out/etc/enterprise.ini --replace "is_test = True" ""
-
-      # Gevent configuration
-      cp $out/etc/enterprise.ini $out/etc/enterprise-gevent.ini;
-      cat >> $out/etc/enterprise-gevent.ini <<EOF
-
-      [server:main]
-      use = egg:gunicorn#main
-      worker_class = gevent
-      EOF
-
-      cp ${enterprise.src}/vcsserver/test.ini $out/etc/vcsserver.ini
-    '';
-  };
-
-  ac-test-drv = import ./acceptance_tests {
-    withExternals = false;
   };
 
-  # TODO: johbo: Currently abusing buildPythonPackage to make the
-  # needed environment for the ac-test tools.
-  mkAcTests = {
-    # Path to an INI file which will be used to run Enterprise.
-    #
-    # Intended usage is to provide different configuration files to
-    # run the tests against a different configuration.
-    enterpriseCfg ? "${test-cfg}/etc/enterprise.ini"
-
-    # Path to an INI file which will be used to run the VCSServer.
-  , vcsserverCfg ? "${test-cfg}/etc/vcsserver.ini"
-  }: pkgs.pythonPackages.buildPythonPackage {
-    name = "enterprise-ac-tests";
-    src = ./acceptance_tests;
-
-    buildInputs = with pkgs; [
-      curl
-      enterprise
-      ac-test-drv
-    ];
-
-    buildPhase = ''
-      cp ${enterpriseCfg} enterprise.ini
-
-      echo "Creating a fake home directory"
-      mkdir fake-home
-      export HOME=$PWD/fake-home
-
-      echo "Creating a repository directory"
-      mkdir repos
-
-      echo "Preparing the database"
-      rc-setup-app \
-        --user=admin \
-        --email=[e-mail] \
-        --password=secret \
-        --api-key=9999999999999999999999999999999999999999 \
-        --force-yes \
-        --repos=$PWD/repos \
-        enterprise.ini > /dev/null
-
-      echo "Starting rc-server"
-      vcsserver --config ${vcsserverCfg} >vcsserver.log 2>&1 &
-      rc-server enterprise.ini >rc-server.log 2>&1 &
-
-      while ! curl -f -s http://localhost:5000 > /dev/null
-      do
-          echo "Waiting for server to be ready..."
-          sleep 3
-      done
-      echo "Webserver is ready."
-
-      echo "Starting the test run"
-      py.test -c example.ini -vs --maxfail=5 tests
-
-      echo "Kill rc-server"
-      kill %2
-      kill %1
-    '';
-
-    # TODO: johbo: Use the install phase again once the normal mkDerivation
-    # can be used again.
-    postInstall = ''
-      mkdir -p $out
-      cp enterprise.ini $out
-      cp ${vcsserverCfg} $out/vcsserver.ini
-      cp rc-server.log $out
-      cp vcsserver.log $out
-
-      mkdir -p $out/nix-support
-      echo "report config $out enterprise.ini" >> $out/nix-support/hydra-build-products
-      echo "report config $out vcsserver.ini" >> $out/nix-support/hydra-build-products
-      echo "report rc-server $out rc-server.log" >> $out/nix-support/hydra-build-products
-      echo "report vcsserver $out vcsserver.log" >> $out/nix-support/hydra-build-products
-    '';
-  };
-
-  vcsserver = import <vcsserver> {
-    inherit pkgs;
-
-    # TODO: johbo: Think of a more elegant solution to this problem
-    pythonExternalOverrides = self: super: (enterprise.myPythonPackagesUnfix self);
-  };
-
-  runTests = optionString: (enterprise.override (attrs: {
-    doCheck = true;
-    name = "test-run";
-    buildInputs = attrs.buildInputs ++ [
-      vcsserver
-    ];
-    checkPhase = ''
-      py.test ${optionString} -vv -ra
-    '';
-    buildPhase = attrs.shellHook;
-    installPhase = ''
-      echo "Intentionally not installing anything"
-    '';
-    meta.description = "Enterprise test run ${optionString}";
-  }));
-
-  jobs = {
-
-    build = enterprise;
-
-    # johbo: Currently this is simply running the tests against the sources. Nicer
-    # would be to run xdist and against the installed application, so that we also
-    # cover the impact of installing the application.
-    test-api = runTests "rhodecode/api";
-    test-functional = runTests "rhodecode/tests/functional";
-    test-rest = runTests "rhodecode/tests --ignore=rhodecode/tests/functional";
-    test-full = runTests "rhodecode";
-
-    docs = mkDocs "docs";
-
-    aggregate = pkgs.releaseTools.aggregate {
-      name = "aggregated-jobs";
-      constituents = [
-        jobs.build
-        jobs.test-api
-        jobs.test-rest
-        jobs.docs
-      ];
-    };
-  };
-
-in jobs
+in {
+  build = enterprise_ce;
+}

requirements.txt

@@ -1,129 +1,129 b''
-## core
-setuptools==30.1.0
-setuptools-scm==1.15.6
+## dependencies
 
-amqp==2.2.2
+setuptools-scm==2.1.0
+amqp==2.3.1
 # not released authomatic that has updated some oauth providers
 https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801#egg=authomatic==0.1.0.post1
-Babel==1.3
-Beaker==1.9.1
-celery==4.1.0
-Chameleon==2.24
+babel==1.3
+beaker==1.9.1
+celery==4.1.1
+chameleon==2.24
 channelstream==0.5.2
 click==6.6
 colander==1.4.0
-configobj==5.0.6
-cssselect==1.0.1
+# our custom configobj
+https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c#egg=configobj==5.0.6
+cssselect==1.0.3
 decorator==4.1.2
-deform==2.0.4
+deform==2.0.5
 docutils==0.14.0
-dogpile.cache==0.6.4
+dogpile.cache==0.6.6
 dogpile.core==0.4.1
 ecdsa==0.13
-FormEncode==1.2.4
+formencode==1.2.4
 future==0.14.3
 futures==3.0.2
 gnureadline==6.3.8
 infrae.cache==1.0.1
-iso8601==0.1.12
+iso8601==0.1.11
 itsdangerous==0.24
-Jinja2==2.9.6
+jinja2==2.9.6
 billiard==3.5.0.3
-kombu==4.1.0
+kombu==4.2.0
 lxml==3.7.3
-Mako==1.0.7
-Markdown==2.6.11
-MarkupSafe==1.0.0
-msgpack-python==0.4.8
-MySQL-python==1.2.5
+mako==1.0.7
+markdown==2.6.11
+markupsafe==1.0.0
+msgpack-python==0.5.6
+mysql-python==1.2.5
+pymysql==0.8.1
+pyotp==2.2.6
 objgraph==3.1.1
 packaging==15.2
-Paste==2.0.3
-PasteDeploy==1.5.2
-PasteScript==2.0.2
+paste==2.0.3
+pastedeploy==1.5.2
+pastescript==2.0.2
 pathlib2==2.3.0
 peppercorn==0.5
-psutil==5.4.3
-psycopg2==2.7.3.2
+psutil==5.4.6
+psycopg2==2.7.4
 py-bcrypt==0.4
 pycrypto==2.6.1
-pycurl==7.19.5
+pycurl==7.43.0.2
 pyflakes==0.8.1
 pygments-markdown-lexer==0.1.0.dev39
-Pygments==2.2.0
+pygments==2.2.0
 pyparsing==1.5.7
 pyramid-beaker==0.8
-pyramid-debugtoolbar==4.3.0
+pyramid-debugtoolbar==4.4.0
 pyramid-jinja2==2.7
 pyramid-mako==1.0.2
-pyramid==1.9.1
+pyramid==1.9.2
 pysqlite==2.8.3
 python-dateutil
-python-ldap==2.4.45
-python-memcached==1.58
-python-pam==1.8.2
-pytz==2018.3
+python-ldap==3.1.0
+python-memcached==1.59
+python-pam==1.8.4
+pytz==2018.4
 tzlocal==1.5.1
 pyzmq==14.6.0
 py-gfm==0.1.3
 redis==2.10.6
 repoze.lru==0.7
 requests==2.9.1
-Routes==2.4.1
+routes==2.4.1
 setproctitle==1.1.10
 simplejson==3.11.1
 six==1.11.0
-SQLAlchemy==1.1.15
+sqlalchemy==1.1.18
 sshpubkeys==2.2.0
-subprocess32==3.2.7
+subprocess32==3.5.1
 supervisor==3.3.4
-Tempita==0.5.2
+tempita==0.5.2
 translationstring==1.3
 trollius==1.0.4
-urllib3==1.16
-URLObject==2.4.0
+urllib3==1.21
+urlobject==2.4.3
 venusian==1.1.0
-WebError==0.10.3
-WebHelpers2==2.0
-WebHelpers==1.3
-WebOb==1.7.4
-Whoosh==2.7.4
+weberror==0.10.3
+webhelpers2==2.0
+webhelpers==1.3
+webob==1.7.4
+whoosh==2.7.4
 wsgiref==0.1.2
 zope.cachedescriptors==4.3.1
 zope.deprecation==4.3.0
 zope.event==4.3.0
-zope.interface==4.4.3
+zope.interface==4.5.0
 
 
 # IPYTHON RENDERING
 # entrypoints backport, pypi version doesn't support egg installs
 https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313#egg=entrypoints==0.2.2.rhodecode-upstream1
 nbconvert==5.3.1
-bleach==2.1.2
+bleach==2.1.4
 nbformat==4.4.0
 jupyter_client==5.0.0
 
 ## cli tools
-alembic==0.9.8
+alembic==0.9.9
 invoke==0.13.0
 bumpversion==0.5.3
-transifex-client==0.12.5
 
 ## http servers
-gevent==1.2.2
+gevent==1.3.5
 greenlet==0.4.13
-gunicorn==19.7.1
+gunicorn==19.9.0
 waitress==1.1.0
-uWSGI==2.0.15
 
 ## debug
-ipdb==0.10.3
+ipdb==0.11.0
 ipython==5.1.0
-CProfileV==1.0.7
+cprofilev==1.0.7
 bottle==0.12.13
 
 ## rhodecode-tools, special case
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.14.1.tar.gz?md5=0b9c2caad160b68889f8172ea54af7b2#egg=rhodecode-tools==0.14.1
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164#egg=rhodecode-tools==0.16.0
 
 ## appenlight
 appenlight-client==0.6.25

requirements_test.txt

@@ -1,15 +1,14 b''
 # test related requirements
-pytest==3.2.5
-py==1.5.2
+pytest==3.6.0
+py==1.5.3
 pytest-cov==2.5.1
-pytest-sugar==0.9.0
-pytest-runner==3.0.0
-pytest-catchlog==1.2.2
-pytest-profiling==1.2.11
+pytest-sugar==0.9.1
+pytest-runner==4.2.0
+pytest-profiling==1.3.0
 gprof2dot==2017.9.19
-pytest-timeout==1.2.0
+pytest-timeout==1.2.1
 
 mock==1.0.1
-WebTest==2.0.29
+webtest==2.0.29
 cov-core==1.15.0
 coverage==3.7.1

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.12.4
  No newline at end of file
+4.13.0
  No newline at end of file

rhodecode/__init__.py

@@ -51,7 +51,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 86  # defines current db version for migrations
+__dbversion__ = 90  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/api/__init__.py

@@ -208,6 +208,7 b' def request_view(request):'
 
         # register our auth-user
         request.rpc_user = auth_u
+        request.environ['rc_auth_user_id'] = auth_u.user_id
 
         # now check if token is valid for API
         auth_token = request.rpc_api_key

rhodecode/api/tests/test_create_pull_request.py

@@ -119,6 +119,7 b' class TestCreatePullRequestApi(object):'
              'mandatory': True},
         ]
         data['reviewers'] = reviewers
+
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
         response = api_call(self.app, params)
@@ -251,8 +252,9 b' class TestCreatePullRequestApi(object):'
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
         response = api_call(self.app, params)
-        expected_message = 'The specified branch `{}` does not exist'.format(
-            branch_name)
+        expected_message = 'The specified value:{type}:`{name}` ' \
+                           'does not exist, or is not allowed.'.format(type='branch',
+                                                                       name=branch_name)
         assert_error(id_, expected_message, given=response.body)
 
     @pytest.mark.backends("git", "hg")
@@ -316,6 +318,7 b' class TestCreatePullRequestApi(object):'
         self.commit_ids = backend.create_master_repo(commits)
         self.source = backend.create_repo(heads=[source_head])
         self.target = backend.create_repo(heads=[target_head])
+
         data = {
             'source_repo': self.source.repo_name,
             'target_repo': self.target.repo_name,

rhodecode/api/tests/test_update_user.py

@@ -76,6 +76,8 b' class TestUpdateUser(object):'
             'user': ret
         }
         expected = ret
+        expected['user']['last_activity'] = response.json['result']['user'][
+            'last_activity']
         assert_ok(id_, expected, given=response.body)
 
     def test_api_update_user_by_user_id(self):
@@ -91,6 +93,8 b' class TestUpdateUser(object):'
             'user': ret
         }
         expected = ret
+        expected['user']['last_activity'] = response.json['result']['user'][
+            'last_activity']
         assert_ok(id_, expected, given=response.body)
 
     def test_api_update_user_default_user(self):

rhodecode/api/tests/test_utils.py

@@ -87,7 +87,8 b' class TestResolveRefOrError(object):'
         ref = 'ancestor:ref'
         with pytest.raises(JSONRPCError) as excinfo:
             utils.resolve_ref_or_error(ref, repo)
-        expected_message = 'The specified ancestor `ref` does not exist'
+        expected_message = (
+            'The specified value:ancestor:`ref` does not exist, or is not allowed.')
         assert excinfo.value.message == expected_message
 
     def test_branch_is_not_found(self):
@@ -99,7 +100,7 b' class TestResolveRefOrError(object):'
             with pytest.raises(JSONRPCError) as excinfo:
                 utils.resolve_ref_or_error(ref, repo)
         expected_message = (
-            'The specified branch `non-existing-one` does not exist')
+            'The specified value:branch:`non-existing-one` does not exist, or is not allowed.')
         assert excinfo.value.message == expected_message
 
     def test_bookmark_is_not_found(self):
@@ -111,7 +112,7 b' class TestResolveRefOrError(object):'
             with pytest.raises(JSONRPCError) as excinfo:
                 utils.resolve_ref_or_error(ref, repo)
         expected_message = (
-            'The specified bookmark `non-existing-one` does not exist')
+            'The specified value:bookmark:`non-existing-one` does not exist, or is not allowed.')
         assert excinfo.value.message == expected_message
 
     @pytest.mark.parametrize("ref", ['ref', '12345', 'a:b:c:d'])

rhodecode/api/utils.py

@@ -403,7 +403,7 b' def resolve_ref_or_error(ref, repo):'
         ref_hash = ref_hash or _get_ref_hash(repo, ref_type, ref_name)
     except (KeyError, ValueError):
         raise JSONRPCError(
-            'The specified {type} `{name}` does not exist'.format(
+            'The specified value:{type}:`{name}` does not exist, or is not allowed.'.format(
                 type=ref_type, name=ref_name))
 
     return ':'.join([ref_type, ref_name, ref_hash])
@@ -431,7 +431,6 b' def _get_commit_dict('
     }
 
 
-# TODO: mikhail: Think about moving this function to some library
 def _get_ref_hash(repo, type_, name):
     vcs_repo = repo.scm_instance()
     if type_ == 'branch' and vcs_repo.alias in ('hg', 'git'):

rhodecode/api/views/pull_request_api.py

@@ -284,7 +284,7 b' def merge_pull_request('
             raise JSONRPCError('userid is not the same as your user')
 
     check = MergeCheck.validate(
-        pull_request, user=apiuser, translator=request.translate)
+        pull_request, auth_user=apiuser, translator=request.translate)
     merge_possible = not check.failed
 
     if not merge_possible:
@@ -302,7 +302,7 b' def merge_pull_request('
         request.environ, repo_name=target_repo.repo_name,
         username=apiuser.username, action='push',
         scm=target_repo.repo_type)
-    merge_response = PullRequestModel().merge(
+    merge_response = PullRequestModel().merge_repo(
         pull_request, apiuser, extras=extras)
     if merge_response.executed:
         PullRequestModel().close_pull_request(
@@ -548,7 +548,8 b' def comment_pull_request('
         closing_pr=False,
         renderer=renderer,
         comment_type=comment_type,
-        resolves_comment_id=resolves_comment_id
+        resolves_comment_id=resolves_comment_id,
+        auth_user=apiuser
     )
 
     if allowed_to_change_status and status:
@@ -573,7 +574,8 b' def comment_pull_request('
 @jsonrpc_method()
 def create_pull_request(
         request, apiuser, source_repo, target_repo, source_ref, target_ref,
-        title=Optional(''), description=Optional(''), reviewers=Optional(None)):
+        title=Optional(''), description=Optional(''), description_renderer=Optional(''),
+        reviewers=Optional(None)):
     """
     Creates a new pull request.
 
@@ -598,6 +600,10 b' def create_pull_request('
     :type title: str
     :param description: Set the pull request description.
     :type description: Optional(str)
+    :type description_renderer: Optional(str)
+    :param description_renderer: Set pull request renderer for the description.
+        It should be 'rst', 'markdown' or 'plain'. If not give default
+        system renderer will be used
     :param reviewers: Set the new pull request reviewers list.
         Reviewer defined by review rules will be added automatically to the
         defined list.
@@ -607,7 +613,7 b' def create_pull_request('
             [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
     """
 
-    source_db_repo =  get_repo_or_error(source_repo)
+    source_db_repo = get_repo_or_error(source_repo)
     target_db_repo = get_repo_or_error(target_repo)
     if not has_superadmin_permission(apiuser):
         _perms = ('repository.admin', 'repository.write', 'repository.read',)
@@ -678,7 +684,11 b' def create_pull_request('
             source_ref=title_source_ref,
             target=target_repo
         )
+    # fetch renderer, if set fallback to plain in case of PR
+    rc_config = SettingsModel().get_all_settings()
+    default_system_renderer = rc_config.get('rhodecode_markup_renderer', 'plain')
     description = Optional.extract(description)
+    description_renderer = Optional.extract(description_renderer) or default_system_renderer
 
     pull_request = PullRequestModel().create(
         created_by=apiuser.user_id,
@@ -690,7 +700,9 b' def create_pull_request('
         reviewers=reviewers,
         title=title,
         description=description,
+        description_renderer=description_renderer,
         reviewer_data=reviewer_rules,
+        auth_user=apiuser
     )
 
     Session().commit()
@@ -704,8 +716,8 b' def create_pull_request('
 @jsonrpc_method()
 def update_pull_request(
         request, apiuser, pullrequestid, repoid=Optional(None),
-        title=Optional(''), description=Optional(''), reviewers=Optional(None),
-        update_commits=Optional(None)):
+        title=Optional(''), description=Optional(''), description_renderer=Optional(''),
+        reviewers=Optional(None), update_commits=Optional(None)):
     """
     Updates a pull request.
 
@@ -719,6 +731,9 b' def update_pull_request('
     :type title: str
     :param description: Update pull request description.
     :type description: Optional(str)
+    :type description_renderer: Optional(str)
+    :param description_renderer: Update pull request renderer for the description.
+        It should be 'rst', 'markdown' or 'plain'
     :param reviewers: Update pull request reviewers list with new value.
     :type reviewers: Optional(list)
         Accepts username strings or objects of the format:
@@ -801,10 +816,15 b' def update_pull_request('
 
     title = Optional.extract(title)
     description = Optional.extract(description)
+    description_renderer = Optional.extract(description_renderer)
+
     if title or description:
         PullRequestModel().edit(
-            pull_request, title or pull_request.title,
-            description or pull_request.description, apiuser)
+            pull_request,
+            title or pull_request.title,
+            description or pull_request.description,
+            description_renderer or pull_request.description_renderer,
+            apiuser)
         Session().commit()
 
     commit_changes = {"added": [], "common": [], "removed": []}

rhodecode/api/views/repo_api.py

@@ -1469,7 +1469,8 b' def comment_commit('
             status_change_type=status,
             renderer=renderer,
             comment_type=comment_type,
-            resolves_comment_id=resolves_comment_id
+            resolves_comment_id=resolves_comment_id,
+            auth_user=apiuser
         )
         if status:
             # also do a status change

rhodecode/apps/_base/__init__.py

@@ -461,31 +461,38 b' class RepoRoutePredicate(object):'
     phash = text
 
     def __call__(self, info, request):
-
         if hasattr(request, 'vcs_call'):
             # skip vcs calls
             return
 
         repo_name = info['match']['repo_name']
         repo_model = repo.RepoModel()
-        by_name_match = repo_model.get_by_repo_name(repo_name, cache=True)
+
+        by_name_match = repo_model.get_by_repo_name(repo_name, cache=False)
 
-        def redirect_if_creating(db_repo):
+        def redirect_if_creating(route_info, db_repo):
+            skip_views = ['edit_repo_advanced_delete']
+            route = route_info['route']
+            # we should skip delete view so we can actually "remove" repositories
+            # if they get stuck in creating state.
+            if route.name in skip_views:
+                return
+
             if db_repo.repo_state in [repo.Repository.STATE_PENDING]:
-                raise HTTPFound(
-                    request.route_path('repo_creating',
-                                       repo_name=db_repo.repo_name))
+                repo_creating_url = request.route_path(
+                    'repo_creating', repo_name=db_repo.repo_name)
+                raise HTTPFound(repo_creating_url)
 
         if by_name_match:
             # register this as request object we can re-use later
             request.db_repo = by_name_match
-            redirect_if_creating(by_name_match)
+            redirect_if_creating(info, by_name_match)
             return True
 
         by_id_match = repo_model.get_repo_by_id(repo_name)
         if by_id_match:
             request.db_repo = by_id_match
-            redirect_if_creating(by_id_match)
+            redirect_if_creating(info, by_id_match)
             return True
 
         return False
@@ -516,7 +523,7 b' class RepoTypeRoutePredicate(object):'
         else:
             log.warning('Current view is not supported for repo type:%s',
                         rhodecode_db_repo.repo_type)
-            #
+
             # h.flash(h.literal(
             #     _('Action not supported for %s.' % rhodecode_repo.alias)),
             #     category='warning')
@@ -542,8 +549,7 b' class RepoGroupRoutePredicate(object):'
 
         repo_group_name = info['match']['repo_group_name']
         repo_group_model = repo_group.RepoGroupModel()
-        by_name_match = repo_group_model.get_by_group_name(
-            repo_group_name, cache=True)
+        by_name_match = repo_group_model.get_by_group_name(repo_group_name, cache=False)
 
         if by_name_match:
             # register this as request object we can re-use later
@@ -569,8 +575,7 b' class UserGroupRoutePredicate(object):'
 
         user_group_id = info['match']['user_group_id']
         user_group_model = user_group.UserGroup()
-        by_id_match = user_group_model.get(
-            user_group_id, cache=True)
+        by_id_match = user_group_model.get(user_group_id, cache=False)
 
         if by_id_match:
             # register this as request object we can re-use later
@@ -596,8 +601,7 b' class UserRoutePredicateBase(object):'
 
         user_id = info['match']['user_id']
         user_model = user.User()
-        by_id_match = user_model.get(
-            user_id, cache=True)
+        by_id_match = user_model.get(user_id, cache=False)
 
         if by_id_match:
             # register this as request object we can re-use later