pkgs: remove optional builtins prefixes from prelude functions

pkgs/applications/audio/mellowplayer/default.nix

@@ -55,7 +55,7 @@ mkDerivation rec {
   # TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this?
   + (builtins.concatStringsSep "\n" (
     lib.lists.flatten (
-      builtins.map (pkg: [
+      map (pkg: [
         (lib.optionalString (pkg ? qtPluginPrefix) ''
           export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
         '')

pkgs/applications/audio/pianoteq/default.nix

@@ -84,7 +84,7 @@ let
       installPhase = ''
         runHook preInstall
         mkdir -p $out/bin
-        mv -t $out/bin ${builtins.concatStringsSep " " (builtins.map (dir: "Pianoteq*/${dir}/*") archdirs)}
+        mv -t $out/bin ${builtins.concatStringsSep " " (map (dir: "Pianoteq*/${dir}/*") archdirs)}
         install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg
         for size in 16 22 32 48 64 128 256; do
           dir=$out/share/icons/hicolor/"$size"x"$size"/apps

pkgs/applications/audio/sonic-pi/update.sh

@@ -19,7 +19,7 @@ vendorhash() {
 
 findpath() {
     path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
-    outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+    outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "fetchGit \"$nixpkgs\"")"
 
     if [ -n "$outpath" ]; then
         path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"

pkgs/applications/blockchains/bitcoin-knots/default.nix

@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
             echo "OK"
           '';
         in
-        builtins.concatStringsSep "\n" (builtins.map script builderKeys);
+        builtins.concatStringsSep "\n" (map script builderKeys);
     in
     ''
       pushd $(mktemp -d)

pkgs/applications/blockchains/bitcoin/default.nix

@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
             echo "OK"
           '';
         in
-        builtins.concatStringsSep "\n" (builtins.map script builderKeys);
+        builtins.concatStringsSep "\n" (map script builderKeys);
     in
     ''
       pushd $(mktemp -d)

pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix

@@ -21,8 +21,8 @@
 
 let
 
-  appPythonDeps = builtins.map (item: item.eafPythonDeps) enabledApps;
-  appOtherDeps = builtins.map (item: item.eafOtherDeps) enabledApps;
+  appPythonDeps = map (item: item.eafPythonDeps) enabledApps;
+  appOtherDeps = map (item: item.eafOtherDeps) enabledApps;
 
   pythonPackageLists = [
     (
@@ -38,7 +38,7 @@ let
     )
   ]
   ++ appPythonDeps;
-  pythonPkgs = ps: builtins.concatLists (builtins.map (f: f ps) pythonPackageLists);
+  pythonPkgs = ps: builtins.concatLists (map (f: f ps) pythonPackageLists);
   pythonEnv = python3.withPackages pythonPkgs;
 
   otherPackageLists = [

pkgs/applications/editors/emacs/make-emacs.nix

@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
         {
           backendPath = (
             lib.concatStringsSep " " (
-              builtins.map (x: ''"-B${x}"'') (
+              map (x: ''"-B${x}"'') (
                 [
                   # Paths necessary so the JIT compiler finds its libraries:
                   "${lib.getLib libgccjit}/lib"

pkgs/applications/editors/jetbrains/plugins/tests.nix

@@ -59,7 +59,7 @@ in
       plugins-for =
         with lib.asserts;
         ide:
-        builtins.map (plugin: plugin.name) (
+        map (plugin: plugin.name) (
           builtins.filter (
             plugin:
             (

pkgs/applications/editors/jetbrains/source/build.nix

@@ -185,7 +185,7 @@ let
   mkRepoEntry = entry: {
     name = ".m2/repository/" + entry.path;
     path = fetchurl {
-      urls = builtins.map (url: "${url}/${entry.url}") repositories;
+      urls = map (url: "${url}/${entry.url}") repositories;
       sha256 = entry.hash;
     };
   };

pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix

@@ -18,7 +18,7 @@ rec {
       ...
     }:
     stdenv.mkDerivation (
-      (builtins.removeAttrs attrs [
+      (removeAttrs attrs [
         "namePrefix"
         "path"
       ])

pkgs/applications/editors/neovim/utils.nix

@@ -230,7 +230,7 @@ let
       nvimGrammars = lib.mapAttrsToList (
         name: value:
         value.origGrammar
-          or (builtins.throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
+          or (throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
       ) vimPlugins.nvim-treesitter.grammarPlugins;
       isNvimGrammar = x: builtins.elem x nvimGrammars;
 

pkgs/applications/editors/sublime/3/common.nix

@@ -42,7 +42,7 @@ let
   ];
   downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2";
   versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
-  versionFile = builtins.toString ./packages.nix;
+  versionFile = toString ./packages.nix;
   archSha256 = if stdenv.hostPlatform.system == "i686-linux" then x32sha256 else x64sha256;
   arch = if stdenv.hostPlatform.system == "i686-linux" then "x32" else "x64";
 

pkgs/applications/editors/sublime/4/common.nix

@@ -46,7 +46,7 @@ let
   downloadUrl =
     arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz";
   versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
-  versionFile = builtins.toString ./packages.nix;
+  versionFile = toString ./packages.nix;
 
   neededLibraries = [
     xorg.libX11

pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix

@@ -111,7 +111,7 @@ in
       tree-sitter-queries-are-present-for-custom-grammars =
         let
           pluginsToCheck =
-            builtins.map (grammar: grammarToPlugin grammar)
+            map (grammar: grammarToPlugin grammar)
               # true is here because there is `recurseForDerivations = true`
               (lib.remove true (lib.attrValues tree-sitter-grammars));
         in

pkgs/applications/editors/vim/plugins/utils/vim-utils.nix

@@ -202,7 +202,7 @@ let
           startWithDeps = findDependenciesRecursively start;
           allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins);
           allPython3Dependencies =
-            ps: lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [ ])) ps) allPlugins);
+            ps: lib.flatten (map (plugin: (plugin.python3Dependencies or (_: [ ])) ps) allPlugins);
           python3Env = python3.withPackages allPython3Dependencies;
 
           packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" allPlugins;

pkgs/applications/editors/vscode/extensions/updateSettings.nix

@@ -24,7 +24,7 @@ let
     )'';
 
   createEmptySettingsCmd = ''mkdir -p .vscode && echo "{}" > ${vscodeSettingsFile}'';
-  fileName = builtins.baseNameOf vscodeSettingsFile;
+  fileName = baseNameOf vscodeSettingsFile;
   symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting ''&& mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" '';
 in
 

pkgs/applications/editors/vscode/extensions/vscode-utils.nix

@@ -127,7 +127,7 @@ let
 
   extensionFromVscodeMarketplace = mktplcExtRefToExtDrv;
   extensionsFromVscodeMarketplace =
-    mktplcExtRefList: builtins.map extensionFromVscodeMarketplace mktplcExtRefList;
+    mktplcExtRefList: map extensionFromVscodeMarketplace mktplcExtRefList;
 
   vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
     inherit lib extensionsFromVscodeMarketplace writeShellScriptBin;

pkgs/applications/graphics/sane/backends/default.nix

@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
       rmdir $out/share/sane/epjitsu
       ln -svT ${scanSnapDriversPackage} $out/share/sane/epjitsu
     ''
-    + lib.concatStrings (builtins.map installFirmware compatFirmware);
+    + lib.concatStrings (map installFirmware compatFirmware);
 
   # parallel install creates a bad symlink at $out/lib/sane/libsane.so.1 which prevents finding plugins
   # https://github.com/NixOS/nixpkgs/issues/224569

pkgs/applications/misc/sweethome3d/linux.nix

@@ -26,7 +26,7 @@ let
 
   # TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
   extensionOf =
-    filePath: lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath)));
+    filePath: lib.concatStringsSep "." (lib.tail (lib.splitString "." (baseNameOf filePath)));
 
   installIcons =
     iconName: icons:

pkgs/applications/networking/browsers/chromium/common.nix

@@ -256,7 +256,7 @@ let
           ''
         else
           ''
-            mkdir -p ${builtins.dirOf path}
+            mkdir -p ${dirOf path}
             cp -r ${dep}/. ${path}
           ''
       )

pkgs/applications/networking/browsers/firefox/wrapper.nix

@@ -76,7 +76,7 @@ let
       # PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards
       smartcardSupport = cfg.smartcardSupport or false;
 
-      allNativeMessagingHosts = builtins.map lib.getBin nativeMessagingHosts;
+      allNativeMessagingHosts = map lib.getBin nativeMessagingHosts;
 
       libs =
         lib.optionals stdenv.hostPlatform.isLinux (
@@ -130,7 +130,7 @@ let
 
       usesNixExtensions = nixExtensions != null;
 
-      nameArray = builtins.map (a: a.name) (lib.optionals usesNixExtensions nixExtensions);
+      nameArray = map (a: a.name) (lib.optionals usesNixExtensions nixExtensions);
 
       # Check that every extension has a unique .name attribute
       # and an extid attribute
@@ -140,7 +140,7 @@ let
         else if browser.requireSigning || !browser.allowAddonSideload then
           throw "Nix addons are only supported with signature enforcement disabled and addon sideloading enabled (eg. LibreWolf)"
         else
-          builtins.map (
+          map (
             a:
             if !(builtins.hasAttr "extid" a) then
               throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchFirefoxAddon"
@@ -516,7 +516,7 @@ let
           rm -f "$POL_PATH"
           cat ${policiesJson} >> "$POL_PATH"
 
-          extraPoliciesFiles=(${builtins.toString extraPoliciesFiles})
+          extraPoliciesFiles=(${toString extraPoliciesFiles})
           for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do
             jq -s '.[0] * .[1]' $extraPoliciesFile "$POL_PATH" > .tmp.json
             mv .tmp.json "$POL_PATH"
@@ -533,7 +533,7 @@ let
           ${mozillaCfg}
           EOF
 
-          extraPrefsFiles=(${builtins.toString extraPrefsFiles})
+          extraPrefsFiles=(${toString extraPrefsFiles})
           for extraPrefsFile in "''${extraPrefsFiles[@]}"; do
             cat "$extraPrefsFile" >> "$libDir/mozilla.cfg"
           done

pkgs/applications/networking/cluster/k3s/builder.nix

@@ -129,11 +129,11 @@ let
   # bundled into the k3s binary
   traefik = {
     chart = fetchurl chartVersions.traefik;
-    name = builtins.baseNameOf chartVersions.traefik.url;
+    name = baseNameOf chartVersions.traefik.url;
   };
   traefik-crd = {
     chart = fetchurl chartVersions.traefik-crd;
-    name = builtins.baseNameOf chartVersions.traefik-crd.url;
+    name = baseNameOf chartVersions.traefik-crd.url;
   };
 
   # a shortcut that provides the images archive for the host platform. Currently only supports

pkgs/applications/networking/cluster/k3s/default.nix

@@ -9,7 +9,7 @@ let
   #     let k3s_1_23 = (callPackage ./path/to/k3s {
   #       commonK3sArg = ....
   #     }).k3s_1_23;
-  extraArgs = builtins.removeAttrs args [ "callPackage" ];
+  extraArgs = removeAttrs args [ "callPackage" ];
 in
 {
   k3s_1_31 = common (

pkgs/applications/networking/cluster/kops/default.nix

@@ -14,7 +14,7 @@ let
       ...
     }@attrs:
     let
-      attrs' = builtins.removeAttrs attrs [
+      attrs' = removeAttrs attrs [
         "version"
         "sha256"
         "rev"

pkgs/applications/networking/cluster/nomad/default.nix

@@ -18,7 +18,7 @@ let
       ...
     }@attrs:
     let
-      attrs' = builtins.removeAttrs attrs [
+      attrs' = removeAttrs attrs [
         "buildGoModule"
         "version"
         "hash"

pkgs/applications/networking/cluster/rke2/default.nix

@@ -2,7 +2,7 @@
 
 let
   common = opts: callPackage (import ./builder.nix lib opts);
-  extraArgs = builtins.removeAttrs args [ "callPackage" ];
+  extraArgs = removeAttrs args [ "callPackage" ];
 in
 rec {
   rke2_1_30 = common (

pkgs/applications/networking/cluster/terraform/default.nix

@@ -21,7 +21,7 @@ let
       ...
     }@attrs:
     let
-      attrs' = builtins.removeAttrs attrs [
+      attrs' = removeAttrs attrs [
         "version"
         "hash"
         "vendorHash"

pkgs/applications/networking/instant-messengers/franz/generic.nix

@@ -40,7 +40,7 @@
   ...
 }@args:
 let
-  cleanedArgs = builtins.removeAttrs args [
+  cleanedArgs = removeAttrs args [
     "pname"
     "name"
     "version"

pkgs/applications/networking/irc/weechat/wrapper.nix

@@ -19,7 +19,7 @@ let
         {
           # Do not include PHP by default, because it bloats the closure, doesn't
           # build on Darwin, and there are no official PHP scripts.
-          plugins = builtins.attrValues (builtins.removeAttrs availablePlugins [ "php" ]);
+          plugins = builtins.attrValues (removeAttrs availablePlugins [ "php" ]);
         },
     }:
 
@@ -122,7 +122,7 @@ let
           ln -sf ${weechat}/share $out/share
         '')
       ];
-      meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ];
+      meta = removeAttrs weechat.meta [ "outputsToInstall" ];
     };
 
 in

pkgs/applications/networking/mailreaders/mailnag/default.nix

@@ -95,7 +95,7 @@ python3Packages.buildPythonApplication rec {
 
   # Actually install plugins
   postInstall = ''
-    for plug in ${builtins.toString userPlugins}; do
+    for plug in ${toString userPlugins}; do
       lndir $plug/${python3Packages.python.sitePackages} $out/${python3Packages.python.sitePackages}
     done
   '';

pkgs/applications/networking/mailreaders/thunderbird/update.nix

@@ -7,5 +7,5 @@ callPackage ../../browsers/firefox/update.nix (
   {
     baseUrl = "https://archive.mozilla.org/pub/thunderbird/releases/";
   }
-  // (builtins.removeAttrs args [ "callPackage" ])
+  // (removeAttrs args [ "callPackage" ])
 )

pkgs/applications/office/libreoffice/darwin/default.nix

@@ -57,8 +57,8 @@ stdenvNoCC.mkDerivation {
 
   passthru.updateScript =
     let
-      defaultNixFile = builtins.toString ./default.nix;
-      updateNix = builtins.toString ./update.nix;
+      defaultNixFile = toString ./default.nix;
+      updateNix = toString ./update.nix;
       aarch64Url = dist."aarch64-darwin".url;
       x86_64Url = dist."x86_64-darwin".url;
     in

pkgs/applications/office/libreoffice/wrapper.nix

@@ -67,13 +67,11 @@ let
       "--prefix"
       "QT_PLUGIN_PATH"
       ":"
-      "${lib.makeSearchPath unwrapped.qtbase.qtPluginPrefix (
-        builtins.map lib.getBin unwrapped.qtPackages
-      )}"
+      "${lib.makeSearchPath unwrapped.qtbase.qtPluginPrefix (map lib.getBin unwrapped.qtPackages)}"
       "--prefix"
       "QML2_IMPORT_PATH"
       ":"
-      "${lib.makeSearchPath unwrapped.qtbase.qtQmlPrefix (builtins.map lib.getBin unwrapped.qmlPackages)}"
+      "${lib.makeSearchPath unwrapped.qtbase.qtQmlPrefix (map lib.getBin unwrapped.qmlPackages)}"
     ]
     ++ [
       # Add dictionaries from all NIX_PROFILES