Merge branch 'staging-next' into staging

pkgs/development/interpreters/python/meta-package.nix

@@ -38,11 +38,11 @@ buildPythonPackage {
 
     [project.optional-dependencies]
     ${lib.optionalString (optional-dependencies != { }) (
-      (lib.concatStringsSep "\n" (
+      lib.concatStringsSep "\n" (
         lib.mapAttrsToList (
           group: deps: group + " = " + builtins.toJSON (map lib.getName deps)
         ) optional-dependencies
-      ))
+      )
     )}
 
     [tool.hatch.build.targets.wheel]

pkgs/development/interpreters/python/python2/mk-python-derivation.nix

@@ -171,7 +171,7 @@ let
       checkDrv = drv: if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch drv else drv;
 
     in
-    inputs: map (checkDrv) inputs;
+    inputs: map checkDrv inputs;
 
   # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
   self = toPythonModule (
@@ -212,7 +212,7 @@ let
           setuptoolsBuildHook
         ]
         ++ lib.optionals (format == "pyproject") [
-          (pipBuildHook)
+          pipBuildHook
         ]
         ++ lib.optionals (format == "wheel") [
           wheelUnpackHook
@@ -223,7 +223,7 @@ let
           eggInstallHook
         ]
         ++ lib.optionals (format != "other") [
-          (pipInstallHook)
+          pipInstallHook
         ]
         ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
           # This is a test, however, it should be ran independent of the checkPhase and checkInputs

pkgs/development/interpreters/python/tests.nix

@@ -22,7 +22,7 @@ let
       environments =
         let
           inherit python;
-          pythonEnv = python.withPackages (ps: with ps; [ ]);
+          pythonEnv = python.withPackages (ps: [ ]);
           pythonVirtualEnv =
             if python.isPy3k then
               python.withPackages (ps: with ps; [ virtualenv ])