Merge staging-next into staging

2021-04-05 00:16:41 +00:00
parent c92ac982e9 44e3fc61fe
commit 0269017eb4
20 changed files with 141 additions and 86 deletions
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -8,6 +8,7 @@
 , pytz
 , pytestCheckHook
 , urllib3
+, certifi
 }:

 buildPythonPackage rec {
@@ -26,6 +27,7 @@ buildPythonPackage rec {
    python-dateutil
    pytz
    urllib3
+    certifi
  ];

  checkInputs = [ faker mock nose pytestCheckHook ];