Merge staging into staging-next

1 files changed, 9 insertions, 4 deletions

diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix
index 985f6244cc65..95eebe8ab69d 100644
--- a/pkgs/development/python-modules/routes/default.nix
+++ b/pkgs/development/python-modules/routes/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , repoze_lru
 , six
+, soupsieve
 , webob
 , coverage
 , webtest
@@ -10,15 +11,19 @@
 
 buildPythonPackage rec {
   pname = "Routes";
-  version = "2.4.1";
+  version = "2.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6";
+    sha256 = "b6346459a15f0cbab01a45a90c3d25caf980d4733d628b4cc1952b865125d053";
   };
 
-  propagatedBuildInputs = [ repoze_lru six webob ];
-  checkInputs = [ coverage webtest ];
+  propagatedBuildInputs = [ repoze_lru six soupsieve webob ];
+  # incompatible with latest soupsieve
+  doCheck = false;
+  checkInputs = [ coverage soupsieve webtest ];
+
+  pythonImportsCheck = [ "routes" ];
 
   meta = with stdenv.lib; {
     description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions";