Merge staging-next into staging

2020-06-13 11:03:26 +02:00
parent c8d064eec1 1523382160
commit 2e4b4e3300
343 changed files with 3648 additions and 2203 deletions
--- a/pkgs/development/python-modules/gidgethub/default.nix
+++ b/pkgs/development/python-modules/gidgethub/default.nix
@@ -11,6 +11,7 @@
 , tornado
 , aiohttp
 , uritemplate
+, pyjwt
 }:

 buildPythonPackage rec {
@@ -26,7 +27,10 @@ buildPythonPackage rec {

  nativeBuildInputs = [ setuptools pytestrunner ];
  checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ];
-  propagatedBuildInputs = [ uritemplate ];
+  propagatedBuildInputs = [
+    uritemplate
+    pyjwt
+  ];

  postPatch = ''
    substituteInPlace setup.py \