Merge remote-tracking branch 'origin/staging-next' into staging

Conflicts:
-	pkgs/development/python-modules/curio/default.nix
-	pkgs/development/python-modules/pytest-httpbin/default.nix
-	pkgs/development/python-modules/xtensor-python/default.nix

1 files changed, 12 insertions, 15 deletions

diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix
index eca3c326d0eb..a7f45bd7b3db 100644
--- a/pkgs/development/python-modules/gitpython/default.nix
+++ b/pkgs/development/python-modules/gitpython/default.nix
@@ -1,12 +1,13 @@
-{ lib
-, buildPythonPackage
-, ddt
-, fetchFromGitHub
-, gitdb
-, pkgs
-, pythonOlder
-, substituteAll
-, typing-extensions
+{
+  lib,
+  buildPythonPackage,
+  ddt,
+  fetchFromGitHub,
+  gitdb,
+  pkgs,
+  pythonOlder,
+  substituteAll,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -27,9 +28,7 @@ buildPythonPackage rec {
     ddt
     gitdb
     pkgs.gitMinimal
-  ] ++ lib.optionals (pythonOlder "3.10") [
-    typing-extensions
-  ];
+  ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   postPatch = ''
     substituteInPlace git/cmd.py \
@@ -39,9 +38,7 @@ buildPythonPackage rec {
   # Tests require a git repo
   doCheck = false;
 
-  pythonImportsCheck = [
-    "git"
-  ];
+  pythonImportsCheck = [ "git" ];
 
   meta = with lib; {
     description = "Python Git Library";