Merge staging-next into staging

pkgs/development/interpreters/python/conda/default.nix

@@ -4,7 +4,7 @@
   # List of libraries that are needed for conda binary packages.
   # When installing a conda binary package, just extend
   # the `buildInputs` with `condaAutopatchLibs`.
-  condaPatchelfLibs = builtins.map (p: p.lib or p) (
+  condaPatchelfLibs = map (p: p.lib or p) (
     [
       pkgs.alsa-lib
       pkgs.cups

pkgs/development/interpreters/python/cpython/default.nix

@@ -403,7 +403,7 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-kpXoIHlz53+0FAm/fK99ZBdNUg0u13erOr1XP2FSkQY=";
       };
     in
-    (builtins.map (f: "${mingw-patch}/${f}") [
+    (map (f: "${mingw-patch}/${f}") [
       # The other patches in that repo are already applied to 3.11.10
       "mingw-python3_distutils.patch"
       "mingw-python3_frozenmain.patch"

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

@@ -171,12 +171,12 @@ let
       checkDrv = drv: if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch drv else drv;
 
     in
-    inputs: builtins.map (checkDrv) inputs;
+    inputs: map (checkDrv) inputs;
 
   # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
   self = toPythonModule (
     stdenv.mkDerivation (
-      (builtins.removeAttrs attrs [
+      (removeAttrs attrs [
         "disabled"
         "checkPhase"
         "checkInputs"