Merge staging-next into staging

2020-08-31 19:46:33 +02:00
parent 0730d80e40 11acdfa497
commit e29c1e42e0
257 changed files with 9979 additions and 12481 deletions
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -1,5 +1,13 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
-, pytest, pytestcov, mock, Mako, decorator
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytest
+, pytestcov
+, mock
+, Mako
+, decorator
+, stevedore
 }:

 buildPythonPackage rec {
@@ -27,7 +35,7 @@ buildPythonPackage rec {

  checkInputs = [ pytest pytestcov mock Mako ];

-  propagatedBuildInputs = [ decorator ];
+  propagatedBuildInputs = [ decorator stevedore ];

  meta = with stdenv.lib; {
    description = "A caching front-end based on the Dogpile lock";