# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-02-05 21:12:30
# Node ID 038875882f171dc07d14b1703b16f1330dfbe501
# Parent  8f6213b2ec4b416baaca4b8267f39649c363712c
# Parent  cb2c72166241c95bd155c5d978185d07a992b11f

release: merge back stable branch into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -13,3 +13,4 @@ 24ffe44a27fcd1c5b6936144e176b9f6dd2f3a17
 beaeeaa440cd17471110d4621b8816506c0dff4a v4.5.0
 668e5c656f61dd94595611844e1106d1361aa6a7 v4.5.1
 ae0640240cb7a77e6dc8c77e64dd80d79732cb5b v4.5.2
+7af06899f426813583fe60449d7517cc49c15b28 v4.6.0
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -432,13 +432,13 @@
     };
   };
   pygments = super.buildPythonPackage {
-    name = "pygments-2.1.3";
+    name = "pygments-2.2.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/Pygments-2.1.3.tar.gz";
-      md5 = "ed3fba2467c8afcda4d317e4ef2c6150";
+      url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+      md5 = "13037baca42f16917cbd5ad2fab50844";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -591,7 +591,7 @@
     name = "rhodecode-vcsserver-4.6.0";
     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; [Beaker configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid pyramid-jinja2 pyramid-mako repoze.lru simplejson subprocess32 subvertpy six translationstring WebOb wheel zope.deprecation zope.interface ipdb gevent greenlet gunicorn waitress Pyro4 serpent pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
+    propagatedBuildInputs = with self; [Beaker configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid pyramid-jinja2 pyramid-mako repoze.lru simplejson subprocess32 subvertpy six translationstring WebOb wheel zope.deprecation zope.interface ipdb ipython gevent greenlet gunicorn waitress Pyro4 serpent pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
     src = ./.;
     meta = {
       license = [ { fullName = "GPL V3"; } { fullName = "GNU General Public License v3 or later (GPLv3+)"; } ];