Merge pull request #28193 from Nadrieril/fix-syncserver

syncserver: fix dependency conflict with webtest
This commit is contained in:
Frederik Rietdijk 2017-08-12 15:04:07 +02:00 committed by GitHub
commit f7a9086758

View File

@ -8087,7 +8087,8 @@ in {
sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h";
};
propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib webtest ];
propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib ];
buildInputs = with self; [ webtest ];
};
pyroute2 = callPackage ../development/python-modules/pyroute2 { };
@ -26268,7 +26269,7 @@ EOF
pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql
pymysqlsa umemcache WSGIProxy requests pybrowserid
];
buildInputs = with self; [ testfixtures unittest2 ];
buildInputs = with self; [ testfixtures unittest2 webtest ];
#doCheck = false; # lazy packager
};