diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index 4e272459bcd4..418e80e15c20 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/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 '') diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 3d654cba8733..fc65c1475f06 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/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 diff --git a/pkgs/applications/audio/sonic-pi/update.sh b/pkgs/applications/audio/sonic-pi/update.sh index 014af49e73a8..1d1cdbc0ff5b 100755 --- a/pkgs/applications/audio/sonic-pi/update.sh +++ b/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}" diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 49e97d731593..14519496f5f6 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/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) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 2a1b52daceb7..b79e33beca2b 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/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) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix index a4bd5c27198e..4b53e05ffa0d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix +++ b/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 = [ diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index f1505d45f4f9..e74e21254b71 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/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" diff --git a/pkgs/applications/editors/jetbrains/plugins/tests.nix b/pkgs/applications/editors/jetbrains/plugins/tests.nix index 8ebfc4194fc2..f260a8560287 100644 --- a/pkgs/applications/editors/jetbrains/plugins/tests.nix +++ b/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: ( diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index ecf8de4257b0..90f412953372 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/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; }; }; diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix index 00d19b291523..1a2b6a62258b 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix @@ -18,7 +18,7 @@ rec { { extraClasspaths ? [ ], }: - (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) + (map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; makeClasspaths = { diff --git a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix index 11a615cfba82..15020deb91b4 100644 --- a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix +++ b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix @@ -18,7 +18,7 @@ rec { ... }: stdenv.mkDerivation ( - (builtins.removeAttrs attrs [ + (removeAttrs attrs [ "namePrefix" "path" ]) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 354b2b0c42fc..8669a4849aba 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/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; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index da26b2a046c7..38452146e105 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/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"; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 6aff26de3622..89f155373d16 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/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 diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index fba459a0689d..f9b35edcf583 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/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 diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix index dbe41260ca06..0f6aa0f404fe 100644 --- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix +++ b/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; diff --git a/pkgs/applications/editors/vscode/extensions/updateSettings.nix b/pkgs/applications/editors/vscode/extensions/updateSettings.nix index fe23e099b536..843bcf4fd270 100644 --- a/pkgs/applications/editors/vscode/extensions/updateSettings.nix +++ b/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 diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index bb15fecc67d2..4719b4ab97dc 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/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; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index a473613ad5e7..361ba67a2678 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/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 diff --git a/pkgs/applications/misc/sweethome3d/linux.nix b/pkgs/applications/misc/sweethome3d/linux.nix index 11d5fee2ffb9..46f24c071cf9 100644 --- a/pkgs/applications/misc/sweethome3d/linux.nix +++ b/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: diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index feac9db09d2e..491da6c1aba0 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/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} '' ) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index cdb5ff484a9a..be43ccc85ad6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/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 diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 41dcb8722d34..d26de30846ba 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/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 diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index a758355d32df..c1e6635c0c65 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/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 ( diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 418392b89040..927e6ac75a6a 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -14,7 +14,7 @@ let ... }@attrs: let - attrs' = builtins.removeAttrs attrs [ + attrs' = removeAttrs attrs [ "version" "sha256" "rev" diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 089958bb7a7b..c21adc70c2b7 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -18,7 +18,7 @@ let ... }@attrs: let - attrs' = builtins.removeAttrs attrs [ + attrs' = removeAttrs attrs [ "buildGoModule" "version" "hash" diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index 31fadb41ac29..3ae92345d3da 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/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 ( diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 12b0a90ed4b1..5a0224bc33ab 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -21,7 +21,7 @@ let ... }@attrs: let - attrs' = builtins.removeAttrs attrs [ + attrs' = removeAttrs attrs [ "version" "hash" "vendorHash" diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index f7e6833ec59d..d9326450a3f0 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -40,7 +40,7 @@ ... }@args: let - cleanedArgs = builtins.removeAttrs args [ + cleanedArgs = removeAttrs args [ "pname" "name" "version" diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index 019b730608a5..1ac3a3dc006d 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/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 diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index fdde80e8f0b5..ca78b5510d27 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/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 ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/update.nix b/pkgs/applications/networking/mailreaders/thunderbird/update.nix index e584a88b7030..789550e80add 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/update.nix +++ b/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" ]) ) diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index f5e25e49c69f..54a0b8a221d4 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/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 diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 8e7eea39e440..59fbc699961d 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/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 diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 85c50fc52033..59e7dd7fa5d5 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -67,7 +67,7 @@ let (unwrapped.python.pkgs.toPythonModule unwrapped.passthru.uhd) ] # Add the extraPackages as python modules as well - ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) + ++ (map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten ( lib.mapAttrsToList ( feat: info: @@ -167,7 +167,7 @@ let "QT_PLUGIN_PATH" ":" "${lib.makeSearchPath unwrapped.qt.qtbase.qtPluginPrefix ( - builtins.map lib.getBin ( + map lib.getBin ( [ unwrapped.qt.qtbase ] @@ -180,7 +180,7 @@ let "QML2_IMPORT_PATH" ":" "${lib.makeSearchPath unwrapped.qt.qtbase.qtQmlPrefix ( - builtins.map lib.getBin ( + map lib.getBin ( [ unwrapped.qt.qtbase ] @@ -225,7 +225,7 @@ let lndir -silent ${unwrapped} ${lib.optionalString (extraPackages != [ ]) ( builtins.concatStringsSep "\n" ( - builtins.map (pkg: '' + map (pkg: '' if [[ -d ${lib.getBin pkg}/bin/ ]]; then lndir -silent ${pkg}/bin ./bin fi diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 42f482e9e016..a09f27004e4a 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { --replace "qe_git_submodule_update(external/d3q)" "" \ --replace "qe_git_submodule_update(external/qe-gipaw)" "" - ${builtins.toString ( + ${toString ( builtins.attrValues ( builtins.mapAttrs (name: val: '' cp -r ${val}/* external/${name}/. diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index f586b7e64cbf..0b1d36fc2d99 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -45,7 +45,7 @@ let downloadUrl = arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}"; - versionFile = builtins.toString ./default.nix; + versionFile = toString ./default.nix; neededLibraries = [ xorg.libX11 diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 27a571d0229d..837de444b22c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; in with gst_all_1; - builtins.map gstreamerHook [ + map gstreamerHook [ gstreamer gst-plugins-base gst-plugins-bad diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index debefca16f52..fd7837eb5cc3 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; in with gst_all_1; - builtins.map gstreamerHook [ + map gstreamerHook [ gstreamer gst-plugins-base gst-plugins-bad diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index e0f546dbe956..0b4bffb90528 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -33,7 +33,7 @@ runCommand cri-o-unwrapped.name preferLocalBuild = true; - meta = builtins.removeAttrs cri-o-unwrapped.meta [ "outputsToInstall" ]; + meta = removeAttrs cri-o-unwrapped.meta [ "outputsToInstall" ]; outputs = [ "out" diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 178607421f09..4ceddfa59db5 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -481,7 +481,7 @@ stdenvNoCC.mkDerivation { libc_dev libc_lib ; - default_hardening_flags_str = builtins.toString defaultHardeningFlags; + default_hardening_flags_str = toString defaultHardeningFlags; } // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) { # These will become empty strings when not targeting Darwin. diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 6aaa59df0642..dbeb2a629f20 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -79,7 +79,7 @@ lib.makeOverridable ( [ drv ] ) # Add any extra outputs specified by the caller of `buildEnv`. - ++ lib.filter (p: p != null) (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall); + ++ lib.filter (p: p != null) (map (outName: drv.${outName} or null) extraOutputsToInstall); priority = drv.meta.priority or lib.meta.defaultPriority; }) paths; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6d9780b3913c..4484739d0e59 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -980,7 +980,7 @@ stdenvNoCC.mkDerivation { inherit suffixSalt coreutils_bin bintools; inherit libc_bin libc_dev libc_lib; inherit darwinPlatformForCC; - default_hardening_flags_str = builtins.toString defaultHardeningFlags; + default_hardening_flags_str = toString defaultHardeningFlags; inherit useMacroPrefixMap; } // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) { diff --git a/pkgs/build-support/compress-drv/default.nix b/pkgs/build-support/compress-drv/default.nix index 47987f171892..d45c556fcb54 100644 --- a/pkgs/build-support/compress-drv/default.nix +++ b/pkgs/build-support/compress-drv/default.nix @@ -66,7 +66,7 @@ let in lib.assertMsg ( matches == 1 - ) "compressor ${ext} needs to have exactly one '{}', found ${builtins.toString matches}"; + ) "compressor ${ext} needs to have exactly one '{}', found ${toString matches}"; mkCmd = ext: prog: assert validProg ext prog; diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix index 84819993c48a..394809cbea2f 100644 --- a/pkgs/build-support/coq/meta-fetch/default.nix +++ b/pkgs/build-support/coq/meta-fetch/default.nix @@ -68,7 +68,7 @@ let { ext = "tar.gz"; fmt = "tarball"; - fetchfun = builtins.fetchTarball; + fetchfun = fetchTarball; }; in with kind; diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix index 5b1526b5977e..aa847b0efdf9 100644 --- a/pkgs/build-support/dart/build-dart-application/default.nix +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -130,7 +130,7 @@ let baseDerivation = stdenv.mkDerivation ( finalAttrs: - (builtins.removeAttrs args [ + (removeAttrs args [ "gitHashes" "sdkSourceBuilders" "pubspecLock" diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 1f2c8b26e01b..0d6952465563 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -582,7 +582,7 @@ rec { ... }@args: let - stream = streamLayeredImage (builtins.removeAttrs args [ "compressor" ]); + stream = streamLayeredImage (removeAttrs args [ "compressor" ]); compress = compressorForImage compressor name; in runCommand "${baseNameOf name}.tar${compress.ext}" { @@ -1043,8 +1043,8 @@ rec { ); contentsList = if builtins.isList contents then contents else [ contents ]; - bind-paths = builtins.toString ( - builtins.map (path: "--bind=${path}:${path}!") [ + bind-paths = toString ( + map (path: "--bind=${path}:${path}!") [ "/dev/" "/proc/" "/sys/" @@ -1413,7 +1413,7 @@ rec { ... }@args: let - stream = streamNixShellImage (builtins.removeAttrs args [ "compressor" ]); + stream = streamNixShellImage (removeAttrs args [ "compressor" ]); compress = compressorForImage compressor drv.name; in runCommand "${drv.name}-env.tar${compress.ext}" { diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index aa522350a3f2..b904f188a4af 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -699,7 +699,7 @@ rec { " --program-prefix=layeredImageWithFakeRootCommands-" ]; doCheck = false; - versionCheckProgram = "${builtins.placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = prevAttrs.meta // { mainProgram = "layeredImageWithFakeRootCommands-hello"; }; diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix index 05cba02f79b7..a2c1fd63cc0e 100644 --- a/pkgs/build-support/dotnet/add-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix @@ -49,7 +49,7 @@ let assert (lib.isPath nugetDeps); callPackage nugetDeps { fetchNuGet = fetchNupkg; } else - builtins.map fetchNupkg (lib.importJSON nugetDeps); + map fetchNupkg (lib.importJSON nugetDeps); finalPackage = finalAttrs.finalPackage; diff --git a/pkgs/build-support/dotnet/build-dotnet-package/default.nix b/pkgs/build-support/dotnet/build-dotnet-package/default.nix index 582084095e3d..803dc2c7ddfe 100644 --- a/pkgs/build-support/dotnet/build-dotnet-package/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-package/default.nix @@ -122,4 +122,4 @@ let ''; }; in -stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" ])) +stdenv.mkDerivation (attrs // (removeAttrs attrsOrig [ "nativeBuildInputs" ])) diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix index 668ce30404f2..75ff45cd2a27 100644 --- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -21,7 +21,7 @@ lib.makeOverridable ( assert (lib.isPath sourceFile); import sourceFile else - { fetchNuGet }: builtins.map fetchNuGet (lib.importJSON sourceFile); + { fetchNuGet }: map fetchNuGet (lib.importJSON sourceFile); in loadDeps { fetchNuGet = args: fetchNupkg (args // { inherit installable; }); diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index 795c37b3c698..d851f982086d 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -29,10 +29,10 @@ assert null == lib.findFirst (c: "/" == c) null (lib.stringToCharacters imageNam let # Abuse paths to collapse possible double slashes - repoTag0 = builtins.toString (/. + "/${stripScheme registry}/${repository}/${imageName}"); + repoTag0 = toString (/. + "/${stripScheme registry}/${repository}/${imageName}"); repoTag1 = lib.removePrefix "/" repoTag0; - layers = builtins.map stripNixStore imageLayers; + layers = map stripNixStore imageLayers; manifest = writeText "manifest.json" ( builtins.toJSON [ diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index 1da312f5d100..67fcdc48c9c5 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -66,7 +66,7 @@ let else map mkJarUrl repos; jar = fetchurl ( - builtins.removeAttrs args [ + removeAttrs args [ "groupId" "artifactId" "version" diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 428001bba7ad..d42d7eedcdb1 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -88,8 +88,8 @@ lib.throwIfNot (excludes == [ ] || includes == [ ]) filterdiff \ -p1 \ - ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ - ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \ + ${toString (map (x: "-x ${lib.escapeShellArg x}") excludes)} \ + ${toString (map (x: "-i ${lib.escapeShellArg x}") includes)} \ "$tmpfile" > "$out" if [ ! -s "$out" ]; then @@ -106,7 +106,7 @@ lib.throwIfNot (excludes == [ ] || includes == [ ]) '' + postFetch; } - // builtins.removeAttrs args [ + // removeAttrs args [ "relative" "stripLen" "decode" diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix index cb7e443ab7ef..d291c57429c1 100644 --- a/pkgs/build-support/fetchpypi/default.nix +++ b/pkgs/build-support/fetchpypi/default.nix @@ -43,7 +43,7 @@ let ); in - compute (builtins.removeAttrs attrs [ "format" ]); + compute (removeAttrs attrs [ "format" ]); in makeOverridable ( @@ -55,7 +55,7 @@ makeOverridable ( }@attrs: let url = computeUrl ( - builtins.removeAttrs attrs [ + removeAttrs attrs [ "sha256" "hash" ] diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 4935806ece18..5bebbb4f1e88 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -6,7 +6,7 @@ lib.fetchers.withNormalizedHash { } ( { s3url, - name ? builtins.baseNameOf s3url, + name ? baseNameOf s3url, outputHash, outputHashAlgo, region ? "us-east-1", diff --git a/pkgs/build-support/make-impure-test.nix b/pkgs/build-support/make-impure-test.nix index 2ff1ed0bcc2d..3a462964b3d2 100644 --- a/pkgs/build-support/make-impure-test.nix +++ b/pkgs/build-support/make-impure-test.nix @@ -45,7 +45,7 @@ }@args: let - sandboxPathsTests = builtins.map (path: "[[ ! -e '${path}' ]]") sandboxPaths; + sandboxPathsTests = map (path: "[[ ! -e '${path}' ]]") sandboxPaths; sandboxPathsTest = lib.concatStringsSep " || " sandboxPathsTests; sandboxPathsList = lib.concatStringsSep " " sandboxPaths; @@ -71,7 +71,7 @@ let passthru.runScript = runScript; } ( - builtins.removeAttrs args [ + removeAttrs args [ "lib" "stdenv" "writeShellScript" diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index ad34882b3891..83dfeca87fce 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -29,7 +29,7 @@ let # this leaves actual dependencies of the derivations in `inputsFrom`, but never the derivations themselves (lib.subtractLists inputsFrom (lib.flatten (lib.catAttrs name inputsFrom))); - rest = builtins.removeAttrs attrs [ + rest = removeAttrs attrs [ "name" "packages" "inputsFrom" diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index c8c4a9030163..cac50cb7401a 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -24,7 +24,7 @@ filter = name: type: let - name' = builtins.baseNameOf name; + name' = baseNameOf name; in name' != "default.nix" && name' != "target"; }; diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix index cfea6ef4e1b5..c299ca46928d 100644 --- a/pkgs/build-support/node/import-npm-lock/default.nix +++ b/pkgs/build-support/node/import-npm-lock/default.nix @@ -52,7 +52,7 @@ let // fetcherOpts )) else if lib.hasPrefix "git" module.resolved then - (builtins.fetchGit ( + (fetchGit ( { url = module.resolved; } diff --git a/pkgs/build-support/ocaml/topkg.nix b/pkgs/build-support/ocaml/topkg.nix index 4c2d5d26d6c6..4326a61913e9 100644 --- a/pkgs/build-support/ocaml/topkg.nix +++ b/pkgs/build-support/ocaml/topkg.nix @@ -32,7 +32,7 @@ lib.throwIf (args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.m inherit (topkg) buildPhase installPhase; } - // (builtins.removeAttrs args [ "minimalOCamlVersion" ]) + // (removeAttrs args [ "minimalOCamlVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 5abd4e97f327..bce23c7c90e9 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation ( } # Then, the caller-supplied attributes. - // (builtins.removeAttrs args [ "lib" ]) + // (removeAttrs args [ "lib" ]) // # And finally, our own stuff. diff --git a/pkgs/build-support/replace-vars/replace-vars-with.nix b/pkgs/build-support/replace-vars/replace-vars-with.nix index 42be45b6dcf1..c863c6fb617f 100644 --- a/pkgs/build-support/replace-vars/replace-vars-with.nix +++ b/pkgs/build-support/replace-vars/replace-vars-with.nix @@ -72,7 +72,7 @@ let optionalAttrs = if (builtins.intersectAttrs attrs forcedAttrs == { }) then - builtins.removeAttrs attrs [ "replacements" ] + removeAttrs attrs [ "replacements" ] else throw "Passing any of ${builtins.concatStringsSep ", " (builtins.attrNames forcedAttrs)} to replaceVarsWith is not supported."; diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index e54e76ff8aa4..c931d920d191 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -250,7 +250,7 @@ lib.makeOverridable "codegenUnits" "links" ]; - extraDerivationAttrs = builtins.removeAttrs crate processedAttrs; + extraDerivationAttrs = removeAttrs crate processedAttrs; nativeBuildInputs_ = nativeBuildInputs; buildInputs_ = buildInputs; extraRustcOpts_ = extraRustcOpts; diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index e2e89d1fa338..208714152c56 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -91,7 +91,7 @@ let mkTest = crateArgs: let - crate = mkHostCrate (builtins.removeAttrs crateArgs [ "expectedTestOutput" ]); + crate = mkHostCrate (removeAttrs crateArgs [ "expectedTestOutput" ]); hasTests = crateArgs.buildTests or false; expectedTestOutputs = crateArgs.expectedTestOutputs or null; binaries = map (v: lib.escapeShellArg v.name) (crateArgs.crateBin or [ ]); @@ -182,7 +182,7 @@ let assert (builtins.isList expectedFiles); let - crate = mkCrate (builtins.removeAttrs crateArgs [ "expectedTestOutput" ]); + crate = mkCrate (removeAttrs crateArgs [ "expectedTestOutput" ]); crateOutput = if output == null then crate else crate."${output}"; expectedFilesFile = writeTextFile { name = "expected-files-${name}"; @@ -706,7 +706,7 @@ rec { rustCargoTomlInTopDir = let - withoutCargoTomlSearch = builtins.removeAttrs rustCargoTomlInSubDir [ "workspace_member" ]; + withoutCargoTomlSearch = removeAttrs rustCargoTomlInSubDir [ "workspace_member" ]; in withoutCargoTomlSearch // { diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index 08219db54930..69905245b2d7 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -73,7 +73,7 @@ rec { let members = builtins.attrValues workspaceMembers; in - builtins.map (m: m.build) members; + map (m: m.build) members; }; # @@ -4347,7 +4347,7 @@ rec { sourceFilter = name: type: let - baseName = builtins.baseNameOf (builtins.toString name); + baseName = baseNameOf (toString name); in !( # Filter out git @@ -4603,7 +4603,7 @@ rec { let features = mergedFeatures."${packageId}" or [ ]; crateConfig' = crateConfigs."${packageId}"; - crateConfig = builtins.removeAttrs crateConfig' [ + crateConfig = removeAttrs crateConfig' [ "resolvedDefaultFeatures" "devDependencies" ]; @@ -4657,7 +4657,7 @@ rec { version = package.version; }; in - lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped; + lib.mapAttrs (name: choices: map versionAndRename choices) grouped; in buildRustCrateForPkgsFunc pkgs ( crateConfig @@ -4715,7 +4715,7 @@ rec { if builtins.isAttrs val then lib.mapAttrs (n: v: sanitizeForJson v) val else if builtins.isList val then - builtins.map sanitizeForJson val + map sanitizeForJson val else if builtins.isFunction val then "function" else @@ -4826,7 +4826,7 @@ rec { assert (builtins.isAttrs target); assert (builtins.isBool runTests); let - crateConfig = crateConfigs."${packageId}" or (builtins.throw "Package not found: ${packageId}"); + crateConfig = crateConfigs."${packageId}" or (throw "Package not found: ${packageId}"); expandedFeatures = expandFeatures (crateConfig.features or { }) features; enabledFeatures = enableFeatures (crateConfig.dependencies or [ ]) expandedFeatures; depWithResolvedFeatures = @@ -4984,7 +4984,7 @@ rec { dependencyPrefix = (dependency.rename or dependency.name) + "/"; dependencyFeatures = builtins.filter (f: lib.hasPrefix dependencyPrefix f) features; in - builtins.map (lib.removePrefix dependencyPrefix) dependencyFeatures; + map (lib.removePrefix dependencyPrefix) dependencyFeatures; in defaultOrNil ++ explicitFeatures ++ additionalDependencyFeatures; @@ -5002,7 +5002,7 @@ rec { deprecationWarning = message: value: if strictDeprecation then - builtins.throw "strictDeprecation enabled, aborting: ${message}" + throw "strictDeprecation enabled, aborting: ${message}" else builtins.trace message value; diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index ff9b8a87ebbf..3297764bb4bb 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -86,7 +86,7 @@ let outputHashAlgo = if hash == "" then "sha256" else null; outputHashMode = "recursive"; } - // builtins.removeAttrs args removedArgs + // removeAttrs args removedArgs ); in diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index ded382f42247..a3cd9b825ffc 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -16,7 +16,7 @@ # Cargo lock file contents as string lockFileContents ? null, - # Allow `builtins.fetchGit` to be used to not require hashes for git dependencies + # Allow `fetchGit` to be used to not require hashes for git dependencies allowBuiltinFetchGit ? false, # Additional registries to pull sources from @@ -57,7 +57,7 @@ let # shadows args.lockFileContents lockFileContents = if lockFile != null then builtins.readFile lockFile else args.lockFileContents; - parsedLockFile = builtins.fromTOML lockFileContents; + parsedLockFile = fromTOML lockFileContents; # lockfile v1 and v2 don't have the `version` key, so assume v2 # we can implement more fine-grained detection later, if needed @@ -75,11 +75,11 @@ let # Force evaluation of the git SHA -> hash mapping, so that an error is # thrown if there are stale hashes. We cannot rely on gitShaOutputHash # being evaluated otherwise, since there could be no git dependencies. - depCrates = builtins.deepSeq gitShaOutputHash (builtins.map mkCrate depPackages); + depCrates = builtins.deepSeq gitShaOutputHash (map mkCrate depPackages); # Map package name + version to git commit SHA for packages with a git source. namesGitShas = builtins.listToAttrs ( - builtins.map nameGitSha (builtins.filter (pkg: lib.hasPrefix "git+" pkg.source) depPackages) + map nameGitSha (builtins.filter (pkg: lib.hasPrefix "git+" pkg.source) depPackages) ); nameGitSha = @@ -188,7 +188,7 @@ let sha256 = gitShaOutputHash.${gitParts.sha}; } else if allowBuiltinFetchGit then - builtins.fetchGit { + fetchGit { inherit (gitParts) url; rev = gitParts.sha; allRefs = true; diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix index 72ea53ce45f8..ac95f33b4840 100644 --- a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix +++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix @@ -33,7 +33,7 @@ let foo '' else - builtins.throw "Invalid scope: ${scope}"; + throw "Invalid scope: ${scope}"; in { name, diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix index ef77291d64c7..feb585adb508 100644 --- a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix +++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix @@ -33,7 +33,7 @@ let foo '' else - builtins.throw "Invalid scope: ${scope}"; + throw "Invalid scope: ${scope}"; in { name, diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index b732c6156041..dfd82df54b71 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -60,9 +60,9 @@ in # If we are passed a derivation (based on stdenv*), we can use overrideAttrs to # update the arguments to mkDerivation. This gives us the proper awareness of # what arguments were effectively passed *to* mkDerivation as opposed to -# builtins.derivation (by mkDerivation). For example, stdenv.mkDerivation +# derivation (by mkDerivation). For example, stdenv.mkDerivation # accepts an `env` attribute set which is postprocessed before being passed to -# builtins.derivation. This can lead to evaluation failures, if we assume +# derivation. This can lead to evaluation failures, if we assume # that drvAttrs is equivalent to the arguments passed to mkDerivation. # See https://github.com/NixOS/nixpkgs/issues/269539. if lib.isDerivation attrs && attrs ? overrideAttrs then diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 9bd25940a194..c35e03cada76 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -225,7 +225,7 @@ "testers.hasPkgConfigModule has been deprecated in favor of testers.hasPkgConfigModules. It accepts a list of strings via the moduleNames argument instead of a single moduleName." ( testers.hasPkgConfigModules ( - builtins.removeAttrs args [ "moduleName" ] + removeAttrs args [ "moduleName" ] // { moduleNames = [ moduleName ]; } diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 2bbf568f79ee..620efd0cfad2 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -94,7 +94,7 @@ rec { preferLocalBuild = true; allowSubstitutes = false; }) - // builtins.removeAttrs derivationArgs [ "passAsFile" ] + // removeAttrs derivationArgs [ "passAsFile" ] ); # Docs in doc/build-helpers/trivial-build-helpers.chapter.md @@ -182,7 +182,7 @@ rec { path: text: writeTextFile { inherit text; - name = builtins.baseNameOf path; + name = baseNameOf path; destination = "/${path}"; }; @@ -983,7 +983,7 @@ rec { # TODO: move copyPathsToStore docs to the Nixpkgs manual # Copy a list of paths to the Nix store. - copyPathsToStore = builtins.map copyPathToStore; + copyPathsToStore = map copyPathToStore; # TODO: move applyPatches docs to the Nixpkgs manual /* @@ -1009,7 +1009,7 @@ rec { name ? ( if builtins.typeOf src == "path" then - builtins.baseNameOf src + baseNameOf src else if builtins.isAttrs src && builtins.hasAttr "name" src then src.name else diff --git a/pkgs/build-support/trivial-builders/test-overriding.nix b/pkgs/build-support/trivial-builders/test-overriding.nix index 33823aa0cd25..dbb756579de7 100644 --- a/pkgs/build-support/trivial-builders/test-overriding.nix +++ b/pkgs/build-support/trivial-builders/test-overriding.nix @@ -104,7 +104,7 @@ let runTest = script: let - name = script.name or (builtins.baseNameOf script); + name = script.name or (baseNameOf script); in writeShellScript "run-${name}" '' if [ "$(${script})" != "success" ]; then diff --git a/pkgs/build-support/trivial-builders/test/concat-test.nix b/pkgs/build-support/trivial-builders/test/concat-test.nix index 583d0910f4bc..bb9983ae908b 100644 --- a/pkgs/build-support/trivial-builders/test/concat-test.nix +++ b/pkgs/build-support/trivial-builders/test/concat-test.nix @@ -8,7 +8,7 @@ let stri = writeText "pathToTest"; txt1 = stri "abc"; - txt2 = stri (builtins.toString hello); + txt2 = stri (toString hello); res = concatText "textToTest" [ txt1 txt2 diff --git a/pkgs/build-support/trivial-builders/test/writeShellApplication.nix b/pkgs/build-support/trivial-builders/test/writeShellApplication.nix index 3c9e695486c2..1325d18366fc 100644 --- a/pkgs/build-support/trivial-builders/test/writeShellApplication.nix +++ b/pkgs/build-support/trivial-builders/test/writeShellApplication.nix @@ -13,7 +13,7 @@ let checkShellApplication = args@{ name, expected, ... }: let - writeShellApplicationArgs = builtins.removeAttrs args [ "expected" ]; + writeShellApplicationArgs = removeAttrs args [ "expected" ]; script = writeShellApplication writeShellApplicationArgs; executable = lib.getExe script; expected' = writeTextFile { diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index e7bb27f4ac92..bd4e9209ce67 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -599,7 +599,7 @@ rec { ... }@args: makeScriptWriter ( - (builtins.removeAttrs args [ + (removeAttrs args [ "babashka" ]) // { @@ -692,7 +692,7 @@ rec { in makeScriptWriter ( - (builtins.removeAttrs config [ + (removeAttrs config [ "guile" "libraries" "r6rs" @@ -728,7 +728,7 @@ rec { [ "--no-auto-compile" ] ++ lib.optional r6rs "--r6rs" ++ lib.optional r7rs "--r7rs" - ++ lib.optional (srfi != [ ]) ("--use-srfi=" + concatMapStringsSep "," builtins.toString srfi) + ++ lib.optional (srfi != [ ]) ("--use-srfi=" + concatMapStringsSep "," toString srfi) ++ [ "-s" ] )) "!#" @@ -921,7 +921,7 @@ rec { ... }@args: makeScriptWriter ( - (builtins.removeAttrs args [ "libraries" ]) + (removeAttrs args [ "libraries" ]) // { interpreter = if libraries == [ ] then "${ruby}/bin/ruby" else "${(ruby.withPackages (ps: libraries))}/bin/ruby"; @@ -963,7 +963,7 @@ rec { ... }@args: makeScriptWriter ( - (builtins.removeAttrs args [ "libraries" ]) + (removeAttrs args [ "libraries" ]) // { interpreter = lua.interpreter; # if libraries == [] @@ -1134,7 +1134,7 @@ rec { ... }@args: makeScriptWriter ( - (builtins.removeAttrs args [ "libraries" ]) + (removeAttrs args [ "libraries" ]) // { interpreter = "${lib.getExe (pkgs.perl.withPackages (p: libraries))}"; } @@ -1186,7 +1186,7 @@ rec { "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}"; in makeScriptWriter ( - (builtins.removeAttrs args [ + (removeAttrs args [ "libraries" "flakeIgnore" "doCheck" @@ -1333,7 +1333,7 @@ rec { content: makeScriptWriter ( - (builtins.removeAttrs args [ + (removeAttrs args [ "dotnet-sdk" "fsi-flags" "libraries" diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 1ab0fa692dba..203aac1dbe54 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { doInstallCheck = true; - versionCheckProgram = "${builtins.placeholder "out"}/bin/op"; + versionCheckProgram = "${placeholder "out"}/bin/op"; versionCheckProgramArg = "--version"; passthru = { diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix index 50b022ae117f..075de6a1cd24 100644 --- a/pkgs/by-name/ab/aba/package.nix +++ b/pkgs/by-name/ab/aba/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage { preBuild = '' justFlagsArray+=( - PREFIX=${builtins.placeholder "out"} + PREFIX=${placeholder "out"} MANIFEST_OPTS="--frozen --locked --profile=release" INSTALL_OPTS="--no-track" ) diff --git a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix index d1d397132ba5..e26a0be172ce 100644 --- a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix +++ b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix @@ -24,9 +24,9 @@ runCommand "${alsa-lib.pname}-${alsa-lib.version}" } ( (lib.concatMapStringsSep "\n" (output: '' - mkdir ${builtins.placeholder output} + mkdir ${placeholder output} ${lndir}/bin/lndir ${lib.attrByPath [ output ] null alsa-lib} \ - ${builtins.placeholder output} + ${placeholder output} '') alsa-lib.outputs) + '' cp -r ${merged}/lib/alsa-lib $out/lib diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix index 95ff87707a68..cdaf829d7581 100644 --- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix +++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix @@ -43,7 +43,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${builtins.placeholder "out"}/bin/amazon-cloudwatch-agent"; + versionCheckProgram = "${placeholder "out"}/bin/amazon-cloudwatch-agent"; versionCheckProgramArg = "-version"; diff --git a/pkgs/by-name/ap/apfsprogs/package.nix b/pkgs/by-name/ap/apfsprogs/package.nix index b8b18f6bd563..1ea1b3595633 100644 --- a/pkgs/by-name/ap/apfsprogs/package.nix +++ b/pkgs/by-name/ap/apfsprogs/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { version = "v${finalAttrs.version}"; }; }; - versionTestList = builtins.map mkVersionTest tools; + versionTestList = map mkVersionTest tools; versionTests = lib.mergeAttrsList versionTestList; in diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix index 9c05714c594a..cad2fbd57404 100644 --- a/pkgs/by-name/ap/aporetic/package.nix +++ b/pkgs/by-name/ap/aporetic/package.nix @@ -52,7 +52,7 @@ in symlinkJoin { inherit pname version; - paths = (builtins.map makeIosevkaFont sets); + paths = (map makeIosevkaFont sets); meta = { inherit (src.meta) homepage; diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index b839b089fd9e..51bd2f68da83 100644 --- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-messages"; changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-messages/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix index a8cb48e55294..6a33d21a259d 100644 --- a/pkgs/by-name/bo/bonsai/package.nix +++ b/pkgs/by-name/bo/bonsai/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { hareThirdParty.hare-json ]; - makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ca/catppuccin-gtk/package.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix index 922f6973e979..256f5d549fe3 100644 --- a/pkgs/by-name/ca/catppuccin-gtk/package.nix +++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix @@ -95,9 +95,9 @@ lib.checkListOfEnum "${pname}: theme accent" validAccents accents lib.checkListO mkdir -p $out/share/themes python3 build.py ${variant} \ - --accent ${builtins.toString accents} \ + --accent ${toString accents} \ ${lib.optionalString (size != [ ]) "--size " + size} \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \ --dest $out/share/themes runHook postInstall diff --git a/pkgs/by-name/co/colloid-gtk-theme/package.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix index 2d5e8d5b0774..7f2c05aa7875 100644 --- a/pkgs/by-name/co/colloid-gtk-theme/package.nix +++ b/pkgs/by-name/co/colloid-gtk-theme/package.nix @@ -87,10 +87,10 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants" runHook preInstall name= HOME="$TMPDIR" ./install.sh \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \ --dest $out/share/themes jdupes --quiet --link-soft --recurse $out/share diff --git a/pkgs/by-name/co/colloid-icon-theme/package.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix index 1713fcd89b54..566897e0df59 100644 --- a/pkgs/by-name/co/colloid-icon-theme/package.nix +++ b/pkgs/by-name/co/colloid-icon-theme/package.nix @@ -77,8 +77,8 @@ lib.checkListOfEnum "colloid-icon-theme: scheme variants" runHook preInstall name= ./install.sh \ - ${lib.optionalString (schemeVariants != [ ]) ("--scheme " + builtins.toString schemeVariants)} \ - ${lib.optionalString (colorVariants != [ ]) ("--theme " + builtins.toString colorVariants)} \ + ${lib.optionalString (schemeVariants != [ ]) ("--scheme " + toString schemeVariants)} \ + ${lib.optionalString (colorVariants != [ ]) ("--theme " + toString colorVariants)} \ --dest $out/share/icons jdupes --quiet --link-soft --recurse $out/share diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix index 57a01b6aa50b..375fbe28733c 100644 --- a/pkgs/by-name/co/coredns/package.nix +++ b/pkgs/by-name/co/coredns/package.nix @@ -10,7 +10,7 @@ }: let - attrsToSources = attrs: builtins.map ({ repo, version, ... }: "${repo}@${version}") attrs; + attrsToSources = attrs: map ({ repo, version, ... }: "${repo}@${version}") attrs; in buildGoModule (finalAttrs: { pname = "coredns"; @@ -75,7 +75,7 @@ buildGoModule (finalAttrs: { ) externalPlugins) } diff -u plugin.cfg.orig plugin.cfg || true - for src in ${builtins.toString (attrsToSources externalPlugins)}; do go get $src; done + for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done GOOS= GOARCH= go generate go mod vendor ''; diff --git a/pkgs/by-name/cp/cppitertools/package.nix b/pkgs/by-name/cp/cppitertools/package.nix index 99c363273d52..90a73ff7f9d9 100644 --- a/pkgs/by-name/cp/cppitertools/package.nix +++ b/pkgs/by-name/cp/cppitertools/package.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { # files that are also in that repo. cmakeBuildDir = "cmake-build"; - includeInstallDir = "${builtins.placeholder "out"}/include/cppitertools"; - cmakeInstallDir = "${builtins.placeholder "out"}/share/cmake"; + includeInstallDir = "${placeholder "out"}/include/cppitertools"; + cmakeInstallDir = "${placeholder "out"}/share/cmake"; # This version of cppitertools considers itself as having used the default value, # and issues warning, unless -Dcppitertools_INSTALL_CMAKE_DIR is present as an diff --git a/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix b/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix index 515370a06f0b..8aecaf789d8a 100644 --- a/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix +++ b/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { description = "Brother HL-L2350DW printer driver"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = builtins.map (arch: "${arch}-linux") arches; + platforms = map (arch: "${arch}-linux") arches; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2350dw_us_eu_as&os=128"; maintainers = [ maintainers.sternenseemann ]; }; diff --git a/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix index 8cfaf540ecba..12ba4dd2982b 100644 --- a/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix +++ b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { homepage = "http://www.brother.com/"; description = "Brother HLL2375DW printer driver"; license = licenses.unfree; - platforms = builtins.map (arch: "${arch}-linux") arches; + platforms = map (arch: "${arch}-linux") arches; maintainers = [ maintainers.gador ]; }; } diff --git a/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix b/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix index 2e286d529ad6..18fb22ed747b 100644 --- a/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix +++ b/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { description = "Brother MFC-L2750DW printer driver"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = builtins.map (arch: "${arch}-linux") arches; + platforms = map (arch: "${arch}-linux") arches; maintainers = [ maintainers.lovesegfault ]; }; } diff --git a/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix b/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix index 6de620531193..3096053861d7 100644 --- a/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix +++ b/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { description = "Brother MFC-L2750DW printer driver"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - platforms = builtins.map (arch: "${arch}-linux") arches; + platforms = map (arch: "${arch}-linux") arches; maintainers = [ lib.maintainers.luftmensch-luftmensch ]; }; } diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/update.sh b/pkgs/by-name/cu/curl-impersonate/chrome/update.sh index 31f8349eb702..429bc3700e11 100755 --- a/pkgs/by-name/cu/curl-impersonate/chrome/update.sh +++ b/pkgs/by-name/cu/curl-impersonate/chrome/update.sh @@ -23,7 +23,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}" diff --git a/pkgs/by-name/cu/curl-impersonate/firefox/update.sh b/pkgs/by-name/cu/curl-impersonate/firefox/update.sh index 76dd6099d417..3202ed1c9057 100644 --- a/pkgs/by-name/cu/curl-impersonate/firefox/update.sh +++ b/pkgs/by-name/cu/curl-impersonate/firefox/update.sh @@ -23,7 +23,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}" diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index d59565107167..1850b328def1 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ cunit ]; doCheck = true; - versionCheckProgram = "${builtins.placeholder "out"}/libexec/master"; + versionCheckProgram = "${placeholder "out"}/libexec/master"; versionCheckProgramArg = "-V"; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix index 2e002cfbcd05..e373f97e082e 100644 --- a/pkgs/by-name/di/digiham/package.nix +++ b/pkgs/by-name/di/digiham/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${builtins.placeholder "out"}/bin/dmr_decoder"; + versionCheckProgram = "${placeholder "out"}/bin/dmr_decoder"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 433b894e3822..a837dedac7c6 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -40,7 +40,7 @@ let ); }; - bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; + bits = toString stdenv.hostPlatform.parsed.cpu.bits; osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; pathToDmd = "\${NIX_BUILD_TOP}/dmd/generated/${osname}/release/${bits}/dmd"; diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix index a262b00423e3..e692bf9eb4ff 100644 --- a/pkgs/by-name/do/docker-credential-helpers/package.nix +++ b/pkgs/by-name/do/docker-credential-helpers/package.nix @@ -47,8 +47,8 @@ buildGoModule rec { ]; in '' - for cmd in ${builtins.toString cmds}; do - go build -ldflags "${builtins.toString ldflags}" -trimpath -o bin/docker-credential-$cmd ./$cmd/cmd + for cmd in ${toString cmds}; do + go build -ldflags "${toString ldflags}" -trimpath -o bin/docker-credential-$cmd ./$cmd/cmd done ''; diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix index fb46cd50916f..edd8f75f7367 100644 --- a/pkgs/by-name/dr/dropbear/package.nix +++ b/pkgs/by-name/dr/dropbear/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; CFLAGS = lib.pipe (lib.attrNames dflags) [ - (builtins.map (name: "-D${name}=\\\"${dflags.${name}}\\\"")) + (map (name: "-D${name}=\\\"${dflags.${name}}\\\"")) (lib.concatStringsSep " ") ]; diff --git a/pkgs/by-name/dv/dvdplusrwtools/package.nix b/pkgs/by-name/dv/dvdplusrwtools/package.nix index d61702cc13d6..f99641a856db 100644 --- a/pkgs/by-name/dv/dvdplusrwtools/package.nix +++ b/pkgs/by-name/dv/dvdplusrwtools/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] # Patches from Gentoo ++ - builtins.map + map ( { pfile, sha256 }: fetchpatch { diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index 4243e5b578de..d6c6534257cb 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -127,7 +127,7 @@ let }; }; - beamDeps = builtins.removeAttrs allBeamDeps [ + beamDeps = removeAttrs allBeamDeps [ "sqlite3" "p1_pgsql" "p1_mysql" diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index af332edd8748..371e6612f14a 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation ( finalAttrs: - builtins.removeAttrs pinData [ "hashes" ] + removeAttrs pinData [ "hashes" ] // { pname = "element-desktop"; name = "${finalAttrs.pname}-${finalAttrs.version}"; diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index 1c842d2fe8ec..284a790e4a05 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation ( finalAttrs: - builtins.removeAttrs pinData [ "hashes" ] + removeAttrs pinData [ "hashes" ] // { pname = "element-web"; diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 59c8c0f59952..6ae2bde48e24 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; env = { - ENGAGE_DOCS_LINK = "file://${builtins.placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html"; + ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html"; }; src = fetchFromGitLab { @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd engage ${ builtins.concatStringsSep " " ( - builtins.map (shell: "--${shell} <($out/bin/engage completions ${shell})") [ + map (shell: "--${shell} <($out/bin/engage completions ${shell})") [ "bash" "zsh" "fish" diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix index caba87f35644..bbfe2d0e2508 100644 --- a/pkgs/by-name/ep/epson-escpr2/package.nix +++ b/pkgs/by-name/ep/epson-escpr2/package.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { ]; configureFlags = [ - "--with-cupsfilterdir=${builtins.placeholder "out"}/lib/cups/filter" - "--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model" + "--with-cupsfilterdir=${placeholder "out"}/lib/cups/filter" + "--with-cupsppddir=${placeholder "out"}/share/cups/model" ]; meta = { diff --git a/pkgs/by-name/eu/eurofurence/package.nix b/pkgs/by-name/eu/eurofurence/package.nix index aa341e70a9ba..3da21b84c6c7 100644 --- a/pkgs/by-name/eu/eurofurence/package.nix +++ b/pkgs/by-name/eu/eurofurence/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { ( { url, hash }: fetchzip { - name = builtins.baseNameOf url; + name = baseNameOf url; stripRoot = false; inherit url hash; } diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix index 1e2392b7b544..4f23760a704c 100644 --- a/pkgs/by-name/fc/fcft/package.nix +++ b/pkgs/by-name/fc/fcft/package.nix @@ -65,9 +65,7 @@ stdenv.mkDerivation rec { mesonFlags = [ (lib.mesonEnable "system-nanosvg" true) ] - ++ builtins.map ( - t: lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes) - ) availableShapingTypes; + ++ map (t: lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes)) availableShapingTypes; doCheck = true; diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index dc36b15d8e4a..26fe09dfc89d 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { runtimeEnv = { PNAME = finalAttrs.pname; - PKG_FILE = builtins.toString ./package.nix; + PKG_FILE = toString ./package.nix; GITHUB_REPOSITORY = "${finalAttrs.src.owner}/${finalAttrs.src.repo}"; NNUE_BIG_FILE = nnueBigFile; NNUE_BIG_HASH = nnueBigHash; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index a6142a33e129..8a2a154b4d3c 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { # We fix this by setting the systemd package's `systemdsystemunitdir` pkg-config variable. # # https://man.openbsd.org/pkg-config.1#PKG_CONFIG_$PACKAGE_$VARIABLE - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${builtins.placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; outputs = [ "out" diff --git a/pkgs/by-name/fl/fluent-gtk-theme/package.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix index 3b5b4be1c1ad..a2dc6a21bf3a 100644 --- a/pkgs/by-name/fl/fluent-gtk-theme/package.nix +++ b/pkgs/by-name/fl/fluent-gtk-theme/package.nix @@ -86,10 +86,10 @@ lib.checkListOfEnum "${pname}: theme variants" runHook preInstall name= HOME="$TMPDIR" ./install.sh \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \ --icon nixos \ --dest $out/share/themes diff --git a/pkgs/by-name/fl/fluent-icon-theme/package.nix b/pkgs/by-name/fl/fluent-icon-theme/package.nix index 355ce29e499a..bd02e441ff11 100644 --- a/pkgs/by-name/fl/fluent-icon-theme/package.nix +++ b/pkgs/by-name/fl/fluent-icon-theme/package.nix @@ -60,7 +60,7 @@ lib.checkListOfEnum "${pname}: available color variants" ./install.sh --dest $out/share/icons \ --name Fluent \ - ${builtins.toString colorVariants} \ + ${toString colorVariants} \ ${lib.optionalString allColorVariants "--all"} \ ${lib.optionalString roundedIcons "--round"} \ ${lib.optionalString blackPanelIcons "--black"} diff --git a/pkgs/by-name/fr/freecad/freecad-utils.nix b/pkgs/by-name/fr/freecad/freecad-utils.nix index 3fb384705a06..8d440540d7bf 100644 --- a/pkgs/by-name/fr/freecad/freecad-utils.nix +++ b/pkgs/by-name/fr/freecad/freecad-utils.nix @@ -31,7 +31,7 @@ let in lib.optionalString (val != null) "--run ${installer}"; - pythonsProcessed = builtins.map ( + pythonsProcessed = map ( pyt: if builtins.isString pyt then pyt @@ -57,7 +57,7 @@ let let modulesStr = wrapPathsStr "--module-path" modules; pythonsStr = wrapPathsStr "--python-path" (pythonsProcessed pythons); - makeWrapperFlagsStr = builtins.concatStringsSep " " (builtins.map (f: "'${f}'") makeWrapperFlags); + makeWrapperFlagsStr = builtins.concatStringsSep " " (map (f: "'${f}'") makeWrapperFlags); userCfgStr = wrapCfgStr "user" userCfg; systemCfgStr = wrapCfgStr "system" systemCfg; diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix index 04f6be81d886..3b88653441ef 100644 --- a/pkgs/by-name/fr/freeswitch/package.nix +++ b/pkgs/by-name/fr/freeswitch/package.nix @@ -100,7 +100,7 @@ let modulesConf = let - lst = builtins.map (mod: mod.path) enabledModules; + lst = map (mod: mod.path) enabledModules; str = lib.strings.concatStringsSep "\n" lst; in builtins.toFile "modules.conf" str; diff --git a/pkgs/by-name/ga/ganttproject-bin/package.nix b/pkgs/by-name/ga/ganttproject-bin/package.nix index ab7fbcac624e..b8ba41626fc5 100644 --- a/pkgs/by-name/ga/ganttproject-bin/package.nix +++ b/pkgs/by-name/ga/ganttproject-bin/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mkdir -pv "$out/bin" wrapProgram "$out/share/ganttproject/ganttproject" \ --set JAVA_HOME "${jre}" \ - --prefix _JAVA_OPTIONS " " "${builtins.toString javaOptions}" + --prefix _JAVA_OPTIONS " " "${toString javaOptions}" mv -v "$out/share/ganttproject/ganttproject" "$out/bin" diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 9364e1e84384..7d03232a5d76 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { (previousAttrs.buildInputs or [ ]) ++ lib.lists.concatMap (drv: drv.buildInputs) selectedExtensions ); postInstall = (previousAttrs.postInstall or "") + '' - for extension in ${builtins.toString selectedExtensions} ; do + for extension in ${toString selectedExtensions} ; do cp -r $extension/* $out # Some files are the same for all/several extensions. We allow overwriting them again. chmod -R +w $out diff --git a/pkgs/by-name/ge/getxbook/package.nix b/pkgs/by-name/ge/getxbook/package.nix index e30d863f46fb..11dbf45848f1 100644 --- a/pkgs/by-name/ge/getxbook/package.nix +++ b/pkgs/by-name/ge/getxbook/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - env.NIX_CFLAGS_COMPILE = builtins.toString ( + env.NIX_CFLAGS_COMPILE = toString ( [ "-Wno-error=deprecated-declarations" ] ++ lib.optionals (!stdenv.cc.isClang) [ "-Wno-error=format-truncation" diff --git a/pkgs/by-name/gi/giflib/package.nix b/pkgs/by-name/gi/giflib/package.nix index bf6a84007ab8..5855c5b902e4 100644 --- a/pkgs/by-name/gi/giflib/package.nix +++ b/pkgs/by-name/gi/giflib/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${builtins.placeholder "out"}" + "PREFIX=${placeholder "out"}" ]; postPatch = '' diff --git a/pkgs/by-name/gi/git-quick-stats/package.nix b/pkgs/by-name/gi/git-quick-stats/package.nix index c27447e798fc..b3d3b7231f44 100644 --- a/pkgs/by-name/gi/git-quick-stats/package.nix +++ b/pkgs/by-name/gi/git-quick-stats/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installFlags = [ - "PREFIX=${builtins.placeholder "out"}" + "PREFIX=${placeholder "out"}" ]; postInstall = diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index e984f8f2480a..fd3f655978c7 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -33,7 +33,7 @@ buildGoModule rec { # Move binaries to separate outputs and symlink them back to $out postInstall = lib.concatStringsSep "\n" ( - builtins.map ( + map ( bin: "mkdir -p \$${bin}/bin && mv $out/bin/${bin} \$${bin}/bin/ && ln -s \$${bin}/bin/${bin} $out/bin/" ) bins diff --git a/pkgs/by-name/go/google-cloud-sdk/components.nix b/pkgs/by-name/go/google-cloud-sdk/components.nix index 690afb80e5df..b603f3492452 100644 --- a/pkgs/by-name/go/google-cloud-sdk/components.nix +++ b/pkgs/by-name/go/google-cloud-sdk/components.nix @@ -69,7 +69,7 @@ let lib.fix ( self: builtins.listToAttrs ( - builtins.map (component: { + map (component: { name = component.id; value = componentFromSnapshot self { inherit @@ -96,7 +96,7 @@ let version, }@attrs: let - baseUrl = builtins.dirOf schema_version.url; + baseUrl = dirOf schema_version.url; # Architectures supported by this component. Defaults to all available # architectures. architectures = builtins.filter (arch: builtins.elem arch (builtins.attrNames arches)) ( @@ -115,12 +115,12 @@ let "source" ] component) "${baseUrl}/${component.data.source}"; sha256 = lib.attrByPath [ "data" "checksum" ] "" component; - dependencies = builtins.map (dep: builtins.getAttr dep components) component.dependencies; + dependencies = map (dep: builtins.getAttr dep components) component.dependencies; platforms = if component.platform == { } then lib.platforms.all else - builtins.concatMap (arch: builtins.map (os: toNixPlatform arch os) operating_systems) architectures; + builtins.concatMap (arch: map (os: toNixPlatform arch os) operating_systems) architectures; snapshot = snapshotFromComponent attrs; }; diff --git a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix index 2e704194f69a..986ee2ba4884 100644 --- a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix +++ b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix @@ -43,11 +43,11 @@ let installCheck = let - compNames = builtins.map lib.getName comps_; + compNames = map lib.getName comps_; in '' $out/bin/gcloud components list --only-local-state --format 'value(id)' > component_list.txt - for comp in ${builtins.toString compNames}; do + for comp in ${toString compNames}; do snapshot_file="$out/google-cloud-sdk/.install/$comp.snapshot.json" if ! [ -f "$snapshot_file" ]; then diff --git a/pkgs/by-name/gr/graphhopper/package.nix b/pkgs/by-name/gr/graphhopper/package.nix index b4dd2b989b11..fe3572224f55 100644 --- a/pkgs/by-name/gr/graphhopper/package.nix +++ b/pkgs/by-name/gr/graphhopper/package.nix @@ -11,7 +11,7 @@ ... }: let - version = builtins.fromTOML (builtins.readFile ./version.toml); + version = fromTOML (builtins.readFile ./version.toml); src = fetchFromGitHub { owner = "graphhopper"; diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix index 0208957a2e4f..e91f3485181b 100644 --- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix +++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix @@ -96,10 +96,10 @@ lib.checkListOfEnum "${pname}: theme variants" runHook preInstall name= ./install.sh \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \ --dest $out/share/themes ${lib.optionalString wallpapers "sh -x wallpaper/install-wallpapers.sh"} @@ -112,7 +112,7 @@ lib.checkListOfEnum "${pname}: theme variants" ./install.sh --justcopy --dest $out/share/grub/themes \ ${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \ - ${lib.optionalString (grubScreens != [ ]) "--screen " + builtins.toString grubScreens} + ${lib.optionalString (grubScreens != [ ]) "--screen " + toString grubScreens} ) ''} diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix index f73b64f76c7e..2197d4fafd72 100644 --- a/pkgs/by-name/gr/grcov/package.nix +++ b/pkgs/by-name/gr/grcov/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; skipFlag = test: "--skip " + test; in - builtins.concatStringsSep " " (builtins.map skipFlag skipList); + builtins.concatStringsSep " " (map skipFlag skipList); meta = { description = "Rust tool to collect and aggregate code coverage data for multiple source files"; diff --git a/pkgs/by-name/gu/guile-gnutls/package.nix b/pkgs/by-name/gu/guile-gnutls/package.nix index a19f0469c217..8371a934cea9 100644 --- a/pkgs/by-name/gu/guile-gnutls/package.nix +++ b/pkgs/by-name/gu/guile-gnutls/package.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-guile-site-dir=${builtins.placeholder "out"}/${guile.siteDir}" - "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/${guile.siteCcacheDir}" - "--with-guile-extension-dir=${builtins.placeholder "out"}/lib/guile/${guile.effectiveVersion}/extensions" + "--with-guile-site-dir=${placeholder "out"}/${guile.siteDir}" + "--with-guile-site-ccache-dir=${placeholder "out"}/${guile.siteCcacheDir}" + "--with-guile-extension-dir=${placeholder "out"}/lib/guile/${guile.effectiveVersion}/extensions" ]; meta = with lib; { diff --git a/pkgs/by-name/ha/hare/cross-compilation-tests.nix b/pkgs/by-name/ha/hare/cross-compilation-tests.nix index c5797a9a1566..45245d730e5b 100644 --- a/pkgs/by-name/ha/hare/cross-compilation-tests.nix +++ b/pkgs/by-name/ha/hare/cross-compilation-tests.nix @@ -7,9 +7,7 @@ }: let archs = lib.concatStringsSep " " ( - builtins.map (lib.removeSuffix "-linux") ( - builtins.filter (lib.hasSuffix "-linux") hare.meta.platforms - ) + map (lib.removeSuffix "-linux") (builtins.filter (lib.hasSuffix "-linux") hare.meta.platforms) ); mainDotHare = writeText "main.ha" '' export fn main() void = void; diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index 8f9b1bc89fbe..4db503b574b4 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "HARECACHE=.harecache" - "PREFIX=${builtins.placeholder "out"}" + "PREFIX=${placeholder "out"}" "ARCH=${arch}" "VERSION=${finalAttrs.version}-nixpkgs" "QBEFLAGS=-t${qbePlatform}" diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix index c80e8cb0126b..73257d0296ad 100644 --- a/pkgs/by-name/ha/harec/package.nix +++ b/pkgs/by-name/ha/harec/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qbe ]; makeFlags = [ - "PREFIX=${builtins.placeholder "out"}" + "PREFIX=${placeholder "out"}" "ARCH=${arch}" "VERSION=${finalAttrs.version}-nixpkgs" "QBEFLAGS=-t${qbePlatform}" @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = _experimental-update-script-combinators.sequence ( - builtins.map (item: item.command) [ + map (item: item.command) [ (gitUpdater { attrPath = "harec"; ignoredVersions = [ "-rc[0-9]{1,}" ]; diff --git a/pkgs/by-name/ha/haredo/package.nix b/pkgs/by-name/ha/haredo/package.nix index ee937f9a0c3c..62fd701f099f 100644 --- a/pkgs/by-name/ha/haredo/package.nix +++ b/pkgs/by-name/ha/haredo/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = true; - env.PREFIX = builtins.placeholder "out"; + env.PREFIX = placeholder "out"; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/by-name/hi/himitsu/package.nix b/pkgs/by-name/hi/himitsu/package.nix index dd3e09a7797e..ac9dd0c25dc0 100644 --- a/pkgs/by-name/hi/himitsu/package.nix +++ b/pkgs/by-name/hi/himitsu/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { scdoc ]; - installFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { homepage = "https://himitsustore.org/"; diff --git a/pkgs/by-name/hy/hylafaxplus/package.nix b/pkgs/by-name/hy/hylafaxplus/package.nix index b81bd67847b7..044198f267c9 100644 --- a/pkgs/by-name/hy/hylafaxplus/package.nix +++ b/pkgs/by-name/hy/hylafaxplus/package.nix @@ -33,7 +33,7 @@ let configSite = replaceVars ./config.site { - config_maxgid = lib.optionalString (maxgid != null) ''CONFIG_MAXGID=${builtins.toString maxgid}''; + config_maxgid = lib.optionalString (maxgid != null) ''CONFIG_MAXGID=${toString maxgid}''; ghostscript_version = ghostscript.version; out = null; # "out" will be resolved in post-install.sh inherit coreutils ghostscript libtiff; @@ -41,7 +41,7 @@ let postPatch = replaceVars ./post-patch.sh { inherit configSite; - maxuid = lib.optionalString (maxuid != null) (builtins.toString maxuid); + maxuid = lib.optionalString (maxuid != null) (toString maxuid); faxcover_binpath = lib.makeBinPath [ stdenv.shellPackage coreutils diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix index ac07709c7b95..b1f48169c21d 100644 --- a/pkgs/by-name/ib/ibm-plex/package.nix +++ b/pkgs/by-name/ib/ibm-plex/package.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation { pname = "ibm-plex"; inherit version; - srcs = builtins.map ( + srcs = map ( family: fetchzip { url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip"; diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 05bdb0427dde..0c002e42fbf4 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -56,7 +56,7 @@ let buildLock = { sources = - builtins.map + map (p: { name = p.pname; inherit (p) version; diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix index af7faf513f2d..47e257e65e2e 100644 --- a/pkgs/by-name/im/imv/package.nix +++ b/pkgs/by-name/im/imv/package.nix @@ -61,7 +61,7 @@ let libjpeg = libjpeg_turbo; }; - backendFlags = builtins.map ( + backendFlags = map ( b: if builtins.elem b withBackends then "-D${b}=enabled" else "-D${b}=disabled" ) (builtins.attrNames backends); in @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { inih ] ++ windowSystems."${withWindowSystem}" - ++ builtins.map (b: backends."${b}") withBackends; + ++ map (b: backends."${b}") withBackends; patches = [ (fetchpatch { diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index 38c995ee32a4..6245b34a2a7d 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -123,9 +123,7 @@ let }; # buildInputs necessary for the enabled extraModules - extraInputs = lib.concatMap ( - m: extras."${m}" or (builtins.throw "Unknown extra module ${m}") - ) extraModules; + extraInputs = lib.concatMap (m: extras."${m}" or (throw "Unknown extra module ${m}")) extraModules; # if true, we can't provide a binary version of this # package without violating the GPL 2 diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index e158e3fb5c0c..7d00ee756764 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ (lib.cmakeBool "SKIP_UNIT_TESTS" true) - (lib.cmakeFeature "IGC_DIR" (builtins.toString intel-graphics-compiler)) + (lib.cmakeFeature "IGC_DIR" (toString intel-graphics-compiler)) (lib.cmakeFeature "OCL_ICD_VENDORDIR" "${placeholder "out"}/etc/OpenCL/vendors") # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index fa16d73cbbf6..69a3b7b1c887 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -12,7 +12,7 @@ let variantHashes = import ./variants.nix; validVariants = map (lib.removePrefix "Iosevka") ( - builtins.attrNames (builtins.removeAttrs variantHashes [ "Iosevka" ]) + builtins.attrNames (removeAttrs variantHashes [ "Iosevka" ]) ); in stdenv.mkDerivation rec { diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 21edd614080b..15e3c2a5c81a 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -258,7 +258,7 @@ stdenv.mkDerivation (finalAttrs: { in symlinkJoin { name = "isabelle-with-components-${isabelle.version}"; - paths = [ isabelle ] ++ (builtins.map (c: c.override { inherit isabelle; }) components); + paths = [ isabelle ] ++ (map (c: c.override { inherit isabelle; }) components); postBuild = '' rm $out/bin/* diff --git a/pkgs/by-name/ja/jasper-gtk-theme/package.nix b/pkgs/by-name/ja/jasper-gtk-theme/package.nix index 33ffeaeefa71..662f84cc033e 100644 --- a/pkgs/by-name/ja/jasper-gtk-theme/package.nix +++ b/pkgs/by-name/ja/jasper-gtk-theme/package.nix @@ -81,10 +81,10 @@ lib.checkListOfEnum "${pname}: theme variants" runHook preInstall name= HOME="$TMPDIR" ./install.sh \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \ --dest $out/share/themes jdupes --quiet --link-soft --recurse $out/share diff --git a/pkgs/by-name/ja/jazz2-content/package.nix b/pkgs/by-name/ja/jazz2-content/package.nix index 2a7032322ec0..39a8661412e2 100644 --- a/pkgs/by-name/ja/jazz2-content/package.nix +++ b/pkgs/by-name/ja/jazz2-content/package.nix @@ -8,7 +8,7 @@ runCommandLocal "jazz2-content" { inherit (jazz2) version src; - meta = (builtins.removeAttrs jazz2.meta [ "mainProgram" ]) // { + meta = (removeAttrs jazz2.meta [ "mainProgram" ]) // { description = "Assets needed for jazz2"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ko/kodelife/update.sh b/pkgs/by-name/ko/kodelife/update.sh index 992f7c2bf434..13f93c515321 100755 --- a/pkgs/by-name/ko/kodelife/update.sh +++ b/pkgs/by-name/ko/kodelife/update.sh @@ -24,7 +24,7 @@ nixeval() { 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}" diff --git a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix index 2285e65c80d0..7496c1ed274c 100644 --- a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix +++ b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix @@ -241,11 +241,11 @@ let builder = if x.from >= minRepoVersionValidated then mkMigration else stubBecauseDisabled; in builder x.from x.to x.release x.hash; - migrations = builtins.map mkMigrationOrStub releases; + migrations = map mkMigrationOrStub releases; packageNotBroken = package: !package.meta.broken; migrationsBrokenRemoved = builtins.filter packageNotBroken migrations; - migrationsBrokenStubbed = builtins.map ( + migrationsBrokenStubbed = map ( x: if packageNotBroken x then x else (stubBecauseBroken x.pname) ) migrations; in @@ -253,7 +253,7 @@ in symlinkJoin { name = "kubo-fs-repo-migrations-${version}"; paths = if stubBrokenMigrations then migrationsBrokenStubbed else migrationsBrokenRemoved; - meta = (builtins.removeAttrs kubo-migrator-unwrapped.meta [ "mainProgram" ]) // { + meta = (removeAttrs kubo-migrator-unwrapped.meta [ "mainProgram" ]) // { description = "Several individual migrations for migrating the filesystem repository of Kubo one version at a time"; longDescription = '' This package contains all the individual migrations in the bin directory. diff --git a/pkgs/by-name/ld/ld-audit-search-mod/package.nix b/pkgs/by-name/ld/ld-audit-search-mod/package.nix index 6ad048662edb..0f88d156b38a 100644 --- a/pkgs/by-name/ld/ld-audit-search-mod/package.nix +++ b/pkgs/by-name/ld/ld-audit-search-mod/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - (lib.cmakeFeature "NIX_RTLD_NAME" (builtins.baseNameOf stdenv.cc.bintools.dynamicLinker)) + (lib.cmakeFeature "NIX_RTLD_NAME" (baseNameOf stdenv.cc.bintools.dynamicLinker)) (lib.cmakeFeature "NIX_STORE_DIR" storeDir) ]; diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix index 828e81ed0812..3bb5229cdfab 100644 --- a/pkgs/by-name/le/lemminx/package.nix +++ b/pkgs/by-name/le/lemminx/package.nix @@ -86,7 +86,7 @@ maven.buildMavenPackage rec { passthru = { updateScript = let - pkgFile = builtins.toString ./package.nix; + pkgFile = toString ./package.nix; in lib.getExe (writeShellApplication { name = "update-${pname}"; diff --git a/pkgs/by-name/li/libdynd/package.nix b/pkgs/by-name/li/libdynd/package.nix index 8bfc3412e341..37065b69fee8 100644 --- a/pkgs/by-name/li/libdynd/package.nix +++ b/pkgs/by-name/li/libdynd/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DDYND_BUILD_BENCHMARKS=OFF" ]; - env.NIX_CFLAGS_COMPILE = builtins.toString [ + env.NIX_CFLAGS_COMPILE = toString [ # added to fix build with gcc7+ "-Wno-error=implicit-fallthrough" "-Wno-error=nonnull" diff --git a/pkgs/by-name/li/libpsl-with-scripts/package.nix b/pkgs/by-name/li/libpsl-with-scripts/package.nix index cc31b95798f9..9338e74a9b03 100644 --- a/pkgs/by-name/li/libpsl-with-scripts/package.nix +++ b/pkgs/by-name/li/libpsl-with-scripts/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { cd - ''; links = lib.concatMapStrings ( - output: linkOutput libpsl.${output} (builtins.placeholder output) + output: linkOutput libpsl.${output} (placeholder output) ) libpsl.outputs; in '' diff --git a/pkgs/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix index 6a6ac83b4f6e..a54cf1382739 100644 --- a/pkgs/by-name/ll/llama-swap/ui.nix +++ b/pkgs/by-name/ll/llama-swap/ui.nix @@ -20,7 +20,7 @@ buildNpmPackage (finalAttrs: { rm -rf $out/lib ''; - meta = (builtins.removeAttrs llama-swap.meta [ "mainProgram" ]) // { + meta = (removeAttrs llama-swap.meta [ "mainProgram" ]) // { description = "${llama-swap.meta.description} - UI"; }; }) diff --git a/pkgs/by-name/lu/luarocks-packages-updater/package.nix b/pkgs/by-name/lu/luarocks-packages-updater/package.nix index 153b371bdcde..cf41d472435e 100644 --- a/pkgs/by-name/lu/luarocks-packages-updater/package.nix +++ b/pkgs/by-name/lu/luarocks-packages-updater/package.nix @@ -25,7 +25,7 @@ let luajit ]; - attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); + attrs = fromTOML (builtins.readFile ./pyproject.toml); pname = attrs.project.name; inherit (attrs.project) version; in diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix index 9c5d762fd8eb..f3182f0b6eda 100644 --- a/pkgs/by-name/ma/magma/package.nix +++ b/pkgs/by-name/ma/magma/package.nix @@ -100,7 +100,7 @@ let minArch = let # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map flags.dropDots flags.cudaCapabilities); + cudaArchitectures = (map flags.dropDots flags.cudaCapabilities); minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures); in # "75" -> "750" Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201 diff --git a/pkgs/by-name/ma/matcha-gtk-theme/package.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix index 2f0f5d338649..9b6d4156f668 100644 --- a/pkgs/by-name/ma/matcha-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matcha-gtk-theme/package.nix @@ -56,8 +56,8 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col mkdir -p $out/share/themes name= ./install.sh \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \ --dest $out/share/themes mkdir -p $out/share/doc/matcha-gtk-theme diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index 6b4aa51d8de5..2e167b02a9df 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -71,13 +71,13 @@ let + lib.optionalString buildOffline '' mvn $MAVEN_EXTRA_ARGS de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters} - for artifactId in ${builtins.toString manualMvnArtifacts} + for artifactId in ${toString manualMvnArtifacts} do echo "downloading manual $artifactId" mvn $MAVEN_EXTRA_ARGS dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2 done - for artifactId in ${builtins.toString manualMvnSources} + for artifactId in ${toString manualMvnSources} do group=$(echo $artifactId | cut -d':' -f1) artifact=$(echo $artifactId | cut -d':' -f2) @@ -115,7 +115,7 @@ let ); in stdenv.mkDerivation ( - builtins.removeAttrs args [ "mvnFetchExtraArgs" ] + removeAttrs args [ "mvnFetchExtraArgs" ] // { inherit fetchedMavenDeps; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 52b186fcf432..1505f7c2a6b8 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -118,7 +118,7 @@ python3.pkgs.buildPythonApplication rec { '' ] # Remove problematic tests - ++ (builtins.map (f: ''rm -vr "${f}";'') ( + ++ (map (f: ''rm -vr "${f}";'') ( [ # requires git, creating cyclic dependency ''test cases/common/66 vcstag'' diff --git a/pkgs/by-name/mf/mfcl5750dw/package.nix b/pkgs/by-name/mf/mfcl5750dw/package.nix index 752edbc51b23..597330ef748c 100644 --- a/pkgs/by-name/mf/mfcl5750dw/package.nix +++ b/pkgs/by-name/mf/mfcl5750dw/package.nix @@ -113,7 +113,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.brother.com/"; description = "Brother MFCL5750DW CUPS driver"; license = lib.licenses.unfree; - platforms = builtins.map (arch: "${arch}-linux") arches; + platforms = map (arch: "${arch}-linux") arches; maintainers = with lib.maintainers; [ qdlmcfresh ]; }; }) diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix index d854f28325e1..bfdd8f48fab6 100644 --- a/pkgs/by-name/mi/mission-center/package.nix +++ b/pkgs/by-name/mi/mission-center/package.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${builtins.placeholder "out"}/bin/missioncenter"; + versionCheckProgram = "${placeholder "out"}/bin/missioncenter"; doInstallCheck = true; postFixup = '' diff --git a/pkgs/by-name/mi/mitm-cache/fetch.nix b/pkgs/by-name/mi/mitm-cache/fetch.nix index 0136fb54f87b..6917bbeb8ce2 100644 --- a/pkgs/by-name/mi/mitm-cache/fetch.nix +++ b/pkgs/by-name/mi/mitm-cache/fetch.nix @@ -13,7 +13,7 @@ }@attrs: let - data' = builtins.removeAttrs (if builtins.isPath data then lib.importJSON data else data) [ + data' = removeAttrs (if builtins.isPath data then lib.importJSON data else data) [ "!version" ]; @@ -59,7 +59,7 @@ let ); in runCommand name ( - builtins.removeAttrs attrs [ + removeAttrs attrs [ "name" "data" ] diff --git a/pkgs/by-name/mo/mojave-gtk-theme/package.nix b/pkgs/by-name/mo/mojave-gtk-theme/package.nix index b483b58f762c..3b7f5b99aa48 100644 --- a/pkgs/by-name/mo/mojave-gtk-theme/package.nix +++ b/pkgs/by-name/mo/mojave-gtk-theme/package.nix @@ -137,13 +137,11 @@ lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] butt runHook preInstall name= ./install.sh \ - ${ - lib.optionalString (buttonSizeVariants != [ ]) "--small " + builtins.toString buttonSizeVariants - } \ - ${lib.optionalString (buttonVariants != [ ]) "--alt " + builtins.toString buttonVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (opacityVariants != [ ]) "--opacity " + builtins.toString opacityVariants} \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (buttonSizeVariants != [ ]) "--small " + toString buttonSizeVariants} \ + ${lib.optionalString (buttonVariants != [ ]) "--alt " + toString buttonVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (opacityVariants != [ ]) "--opacity " + toString opacityVariants} \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \ --icon nixos \ --dest $out/share/themes diff --git a/pkgs/by-name/my/mylvmbackup/package.nix b/pkgs/by-name/my/mylvmbackup/package.nix index b45d653fe045..d012ac3bbe22 100644 --- a/pkgs/by-name/my/mylvmbackup/package.nix +++ b/pkgs/by-name/my/mylvmbackup/package.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs mylvmbackup substituteInPlace Makefile \ - --replace "prefix = /usr/local" "prefix = ${builtins.placeholder "out"}" \ - --replace "sysconfdir = /etc" "sysconfdir = ${builtins.placeholder "out"}/etc" \ + --replace "prefix = /usr/local" "prefix = ${placeholder "out"}" \ + --replace "sysconfdir = /etc" "sysconfdir = ${placeholder "out"}/etc" \ --replace "/usr/bin/install" "install" ''; diff --git a/pkgs/by-name/ne/nemo-with-extensions/package.nix b/pkgs/by-name/ne/nemo-with-extensions/package.nix index 52c081c774c8..9bdf5deba5ca 100644 --- a/pkgs/by-name/ne/nemo-with-extensions/package.nix +++ b/pkgs/by-name/ne/nemo-with-extensions/package.nix @@ -54,7 +54,7 @@ symlinkJoin { done ''; - meta = builtins.removeAttrs nemo.meta [ + meta = removeAttrs nemo.meta [ "name" "outputsToInstall" "position" diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix index 09b50753bcfe..a210f22844c6 100644 --- a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix @@ -16,7 +16,7 @@ nim-unwrapped-2.overrideAttrs ( patches = builtins.filter ( p: - builtins.elem (builtins.baseNameOf p) [ + builtins.elem (baseNameOf p) [ "NIM_CONFIG_DIR.patch" "nixbuild.patch" ] diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix index 168dacbff336..e459351c676d 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix @@ -15,7 +15,7 @@ nim-unwrapped-2_2.overrideAttrs ( patches = lib.lists.unique ( builtins.filter ( p: - builtins.elem (builtins.baseNameOf p) [ + builtins.elem (baseNameOf p) [ "NIM_CONFIG_DIR.patch" "nixbuild.patch" "extra-mangling.patch" diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index 2da30a868854..e37cba924edc 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -28,7 +28,7 @@ }: let - attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); + attrs = fromTOML (builtins.readFile ./pyproject.toml); pname = attrs.project.name; inherit (attrs.project) version; in diff --git a/pkgs/by-name/ni/nixos-init/package.nix b/pkgs/by-name/ni/nixos-init/package.nix index b34f6d570899..aab7354c8856 100644 --- a/pkgs/by-name/ni/nixos-init/package.nix +++ b/pkgs/by-name/ni/nixos-init/package.nix @@ -7,7 +7,7 @@ }: let - cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); + cargoToml = fromTOML (builtins.readFile ./Cargo.toml); in rustPlatform.buildRustPackage (finalAttrs: { pname = cargoToml.package.name; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 63af415a6d6d..0fc029c214c1 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -179,7 +179,7 @@ goBuild (finalAttrs: { in if matched == null then str else builtins.head matched; - cudaArchitectures = builtins.concatStringsSep ";" (builtins.map removeSMPrefix cudaArches); + cudaArchitectures = builtins.concatStringsSep ";" (map removeSMPrefix cudaArches); rocmTargets = builtins.concatStringsSep ";" rocmGpuTargets; cmakeFlagsCudaArchitectures = lib.optionalString enableCuda "-DCMAKE_CUDA_ARCHITECTURES='${cudaArchitectures}'"; diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index 03ec4393af1c..2710fd3f7482 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -10,7 +10,7 @@ assert enableWasmEval && stdenv.hostPlatform.isDarwin - -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; + -> throw "building with wasm on darwin is failing in nixpkgs"; buildGoModule rec { pname = "opa-envoy-plugin"; diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 790e1b81741b..1516eaf56a78 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -10,7 +10,7 @@ assert enableWasmEval && stdenv.hostPlatform.isDarwin - -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; + -> throw "building with wasm on darwin is failing in nixpkgs"; buildGoModule (finalAttrs: { pname = "open-policy-agent"; diff --git a/pkgs/by-name/op/openutau/update.sh b/pkgs/by-name/op/openutau/update.sh index d073923c933a..b129cca96e06 100755 --- a/pkgs/by-name/op/openutau/update.sh +++ b/pkgs/by-name/op/openutau/update.sh @@ -19,7 +19,7 @@ nixbuildscript() { 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}" diff --git a/pkgs/by-name/or/orchis-theme/package.nix b/pkgs/by-name/or/orchis-theme/package.nix index af74db27205d..5ba9ce8ec43e 100644 --- a/pkgs/by-name/or/orchis-theme/package.nix +++ b/pkgs/by-name/or/orchis-theme/package.nix @@ -63,10 +63,8 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks installPhase = '' runHook preInstall bash install.sh -d $out/share/themes -t all \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ - ${lib.optionalString (border-radius != null) ( - "--round " + builtins.toString border-radius + "px" - )} + ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \ + ${lib.optionalString (border-radius != null) ("--round " + toString border-radius + "px")} ${lib.optionalString withWallpapers '' mkdir -p $out/share/backgrounds cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds diff --git a/pkgs/by-name/pi/pigpio/package.nix b/pkgs/by-name/pi/pigpio/package.nix index 41b85cc445e6..796847528482 100644 --- a/pkgs/by-name/pi/pigpio/package.nix +++ b/pkgs/by-name/pi/pigpio/package.nix @@ -7,8 +7,7 @@ }: let - mkDerivation = - if builtins.isNull buildPythonPackage then stdenv.mkDerivation else buildPythonPackage; + mkDerivation = if isNull buildPythonPackage then stdenv.mkDerivation else buildPythonPackage; in mkDerivation rec { pname = "pigpio"; diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix index 73362403c25f..93b327eae971 100644 --- a/pkgs/by-name/pi/pihole/package.nix +++ b/pkgs/by-name/pi/pihole/package.nix @@ -72,7 +72,7 @@ solutions.default = let - out = builtins.placeholder "out"; + out = placeholder "out"; scriptsDir = "${out}/share/pihole/advanced/Scripts"; in { diff --git a/pkgs/by-name/pi/pixinsight/package.nix b/pkgs/by-name/pi/pixinsight/package.nix index 212512ef17b9..21e9fb9c924c 100644 --- a/pkgs/by-name/pi/pixinsight/package.nix +++ b/pkgs/by-name/pi/pixinsight/package.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: { ]; dontWrapQtApps = true; postFixup = '' - wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString finalAttrs.qtWrapperArgs} + wrapProgram $out/opt/PixInsight/bin/PixInsight ${toString finalAttrs.qtWrapperArgs} ''; meta = with lib; { diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix index ee52b762baaa..63e5f9d65f1c 100644 --- a/pkgs/by-name/pl/plymouth/package.nix +++ b/pkgs/by-name/pl/plymouth/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { rm -r "$DESTDIR/''${!o}" done # Ensure the DESTDIR is removed. - rmdir "$DESTDIR/${builtins.storeDir}" "$DESTDIR/${builtins.dirOf builtins.storeDir}" "$DESTDIR" + rmdir "$DESTDIR/${builtins.storeDir}" "$DESTDIR/${dirOf builtins.storeDir}" "$DESTDIR" ''; # HACK: We want to install configuration files to $out/etc diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 25afdcbf3ad0..87aaec7f1d78 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ]; runtimeEnv = { PNAME = "podman-desktop"; - PKG_FILE = builtins.toString ./package.nix; + PKG_FILE = toString ./package.nix; }; text = '' new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)" diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index ee3467f2fc46..895959038d04 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # some python tests use uv, which in turn needs python UV_PYTHON = "${python312}/bin/python"; - checkFlags = builtins.map (t: "--skip ${t}") [ + checkFlags = map (t: "--skip ${t}") [ # these tests require internet access "check_added_large_files_hook" "check_json_hook" diff --git a/pkgs/by-name/pr/prowlarr/update.py b/pkgs/by-name/pr/prowlarr/update.py index aeee96d2c280..4bb133688138 100644 --- a/pkgs/by-name/pr/prowlarr/update.py +++ b/pkgs/by-name/pr/prowlarr/update.py @@ -53,7 +53,7 @@ package_attrs = json.loads(subprocess.run( "--json", "--file", nixpkgs_path, "--apply", """p: { - dir = builtins.dirOf p.meta.position; + dir = dirOf p.meta.position; version = p.version; sourceHash = p.src.src.outputHash; yarnHash = p.yarnOfflineCache.outputHash; diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index aa6d2f68966c..fe56d2b32d66 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -78,7 +78,7 @@ let ]; # Hunspell - hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages; + hunspellDirs = map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages; hunspellTargetDirs = "$out/opt/Pulsar/resources/app.asar.unpacked/node_modules/spellchecker/vendor/hunspell_dictionaries"; hunspellCopyCommands = lib.concatMapStringsSep "\n" ( lang: "cp -r ${lang}/* ${hunspellTargetDirs};" diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix index 775b3e31cb0d..653f73c5dad4 100644 --- a/pkgs/by-name/qo/qogir-icon-theme/package.nix +++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix @@ -55,8 +55,8 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color mkdir -p $out/share/icons name= ./install.sh \ - ${lib.optionalString (themeVariants != [ ]) ("--theme " + builtins.toString themeVariants)} \ - ${lib.optionalString (colorVariants != [ ]) ("--color " + builtins.toString colorVariants)} \ + ${lib.optionalString (themeVariants != [ ]) ("--theme " + toString themeVariants)} \ + ${lib.optionalString (colorVariants != [ ]) ("--color " + toString colorVariants)} \ --dest $out/share/icons jdupes --quiet --link-soft --recurse $out/share diff --git a/pkgs/by-name/qo/qogir-theme/package.nix b/pkgs/by-name/qo/qogir-theme/package.nix index 0e0c2c471735..00532e9d574e 100644 --- a/pkgs/by-name/qo/qogir-theme/package.nix +++ b/pkgs/by-name/qo/qogir-theme/package.nix @@ -67,9 +67,9 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a mkdir -p $out/share/themes name= HOME="$TMPDIR" ./install.sh \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \ --dest $out/share/themes mkdir -p $out/share/doc/qogir-theme diff --git a/pkgs/by-name/qr/qrq/package.nix b/pkgs/by-name/qr/qrq/package.nix index 751d17b4c483..283eaba711b4 100644 --- a/pkgs/by-name/qr/qrq/package.nix +++ b/pkgs/by-name/qr/qrq/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "BUILD_INFO=nix" - "DESTDIR=${builtins.placeholder "out"}" + "DESTDIR=${placeholder "out"}" ]; postPatch = '' diff --git a/pkgs/by-name/ra/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix index 17c4dcf61c17..57fbbf224b84 100644 --- a/pkgs/by-name/ra/racket/minimal.nix +++ b/pkgs/by-name/ra/racket/minimal.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { }@config: assert lib.assertMsg (libraries == [ ]) "library integration for Racket has not been implemented"; writers.makeScriptWriter ( - builtins.removeAttrs config [ "libraries" ] + removeAttrs config [ "libraries" ] // { interpreter = "${lib.getExe finalAttrs.finalPackage}"; } diff --git a/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix b/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix index 870542f8f6c0..f49d2e15b2e1 100644 --- a/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix +++ b/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix @@ -10,7 +10,7 @@ runCommandLocal "racket-test-get-version-and-variant" } ( lib.concatLines ( - builtins.map + map ( { expectation, output }: '' diff --git a/pkgs/by-name/ra/radarr/update.py b/pkgs/by-name/ra/radarr/update.py index 007e4583cae6..614abee64279 100644 --- a/pkgs/by-name/ra/radarr/update.py +++ b/pkgs/by-name/ra/radarr/update.py @@ -53,7 +53,7 @@ package_attrs = json.loads(subprocess.run( "--json", "--file", nixpkgs_path, "--apply", """p: { - dir = builtins.dirOf p.meta.position; + dir = dirOf p.meta.position; version = p.version; sourceHash = p.src.src.outputHash; yarnHash = p.yarnOfflineCache.outputHash; diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index 46ca11c74a69..b3bc0827d60c 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -10,7 +10,7 @@ }: let pluginsDir = linkFarm "reposilite-plugins" ( - builtins.map (p: { + map (p: { name = (builtins.parseDrvName p.name).name + ".jar"; path = p.outPath or p; }) plugins diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix index dac5a4e8f82e..e61a5d6a15e7 100644 --- a/pkgs/by-name/re/reversal-icon-theme/package.nix +++ b/pkgs/by-name/re/reversal-icon-theme/package.nix @@ -73,7 +73,7 @@ lib.checkListOfEnum "${pname}: color variants" mkdir -p $out/share/icons name= ./install.sh \ - ${if allColorVariants then "-a" else builtins.toString colorVariants} \ + ${if allColorVariants then "-a" else toString colorVariants} \ -d $out/share/icons rm $out/share/icons/*/{AUTHORS,COPYING} diff --git a/pkgs/by-name/ru/rust-streamdeck/package.nix b/pkgs/by-name/ru/rust-streamdeck/package.nix index 8c8c8b2b5f31..e3a2f3e263ca 100644 --- a/pkgs/by-name/ru/rust-streamdeck/package.nix +++ b/pkgs/by-name/ru/rust-streamdeck/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; postInstall = '' install -Dm444 40-streamdeck.rules -t $out/lib/udev/rules.d/ diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix index 9bb9999e0216..e90d2b63b645 100644 --- a/pkgs/by-name/sh/shogihome/package.nix +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -143,7 +143,7 @@ buildNpmPackage (finalAttrs: { ]; runtimeEnv = { PNAME = finalAttrs.pname; - PKG_FILE = builtins.toString ./package.nix; + PKG_FILE = toString ./package.nix; }; text = '' new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)" diff --git a/pkgs/by-name/si/sierra-gtk-theme/package.nix b/pkgs/by-name/si/sierra-gtk-theme/package.nix index 987a18a8d33e..e044f0c5176c 100644 --- a/pkgs/by-name/si/sierra-gtk-theme/package.nix +++ b/pkgs/by-name/si/sierra-gtk-theme/package.nix @@ -63,10 +63,10 @@ lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVaria mkdir -p $out/share/themes name= ./install.sh --dest $out/share/themes \ - ${lib.optionalString (buttonVariants != [ ]) "--alt " + builtins.toString buttonVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (opacityVariants != [ ]) "--opacity " + builtins.toString opacityVariants} \ - ${lib.optionalString (sizeVariants != [ ]) "--flat " + builtins.toString sizeVariants} + ${lib.optionalString (buttonVariants != [ ]) "--alt " + toString buttonVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (opacityVariants != [ ]) "--opacity " + toString opacityVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--flat " + toString sizeVariants} # Replace duplicate files with hardlinks to the first file in each # set of duplicates, reducing the installed size in about 79% diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index 9ac59650fae9..95d74c881c0c 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-J7gyR7K1hauV+VrzoNzRrooLuSkjk8U6A3aFn9O2yFY="; strictDeps = true; - cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; + cargoBuildFlags = map (n: "--bin=${n}") solanaPkgs; RUSTFLAGS = "-Amismatched_lifetime_syntaxes -Adead_code"; LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index b5eabf16e0e4..7cdeed81fb4a 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -63,7 +63,7 @@ maven.buildMavenPackage rec { passthru.updateScript = let - pkgFile = builtins.toString ./package.nix; + pkgFile = toString ./package.nix; in lib.getExe (writeShellApplication { name = "update-${pname}"; diff --git a/pkgs/by-name/so/sonarr/update.py b/pkgs/by-name/so/sonarr/update.py index 05d1933a1d23..5c8fd4c83700 100644 --- a/pkgs/by-name/so/sonarr/update.py +++ b/pkgs/by-name/so/sonarr/update.py @@ -53,7 +53,7 @@ package_attrs = json.loads(subprocess.run( "--json", "--file", nixpkgs_path, "--apply", """p: { - dir = builtins.dirOf p.meta.position; + dir = dirOf p.meta.position; version = p.version; sourceHash = p.src.src.outputHash; yarnHash = p.yarnOfflineCache.outputHash; diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix index 99b28d32bb68..fe3bc2dddf86 100644 --- a/pkgs/by-name/st/steam/package.nix +++ b/pkgs/by-name/st/steam/package.nix @@ -25,7 +25,7 @@ let ... }@args: buildFHSEnv ( - (builtins.removeAttrs args [ + (removeAttrs args [ "extraPkgs" "extraLibraries" "extraProfile" diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix index 02cfd355f012..6e4b9ee9312c 100644 --- a/pkgs/by-name/st/stockfish/package.nix +++ b/pkgs/by-name/st/stockfish/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ]; runtimeEnv = { PNAME = pname; - PKG_FILE = builtins.toString ./package.nix; + PKG_FILE = toString ./package.nix; NNUE_BIG_FILE = nnueBigFile; NNUE_BIG_HASH = nnueBigHash; NNUE_SMALL_FILE = nnueSmallFile; diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix index daea5cb273c4..73e4062aa015 100644 --- a/pkgs/by-name/st/streamdeck-ui/package.nix +++ b/pkgs/by-name/st/streamdeck-ui/package.nix @@ -103,7 +103,7 @@ python3Packages.buildPythonApplication rec { categories = [ "Utility" ]; }; in - builtins.map makeDesktopItem [ + map makeDesktopItem [ common ( common diff --git a/pkgs/by-name/st/structurizr-cli/package.nix b/pkgs/by-name/st/structurizr-cli/package.nix index c3370146c581..5db3e8af4252 100644 --- a/pkgs/by-name/st/structurizr-cli/package.nix +++ b/pkgs/by-name/st/structurizr-cli/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { } ]; in - builtins.map ( + map ( entry: fetchpatch { url = "https://github.com/structurizr/cli/commit/${entry.rev}.patch"; diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix index 70dbac88c78e..ee6745c234a3 100644 --- a/pkgs/by-name/sw/swi-prolog/package.nix +++ b/pkgs/by-name/sw/swi-prolog/package.nix @@ -64,7 +64,7 @@ # url = "https://github.com/mndrix/list_util/archive/v0.13.0.zip"; # sha256 = "0lx7vffflak0y8l8vg8k0g8qddwwn23ksbz02hi3f8rbarh1n89q"; # }; - # typedef = builtins.fetchTarball { + # typedef = fetchTarball { # name = "swipl-pack-typedef"; # url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz"; # sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3"; @@ -166,7 +166,7 @@ stdenv.mkDerivation { mkdir -p $out/lib/swipl/extra-pack ''; - postInstall = builtins.concatStringsSep "\n" (builtins.map (packInstall "$out") extraPacks); + postInstall = builtins.concatStringsSep "\n" (map (packInstall "$out") extraPacks); meta = { homepage = "https://www.swi-prolog.org"; diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 9b70bfdc53c8..d46d201117d3 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -59,7 +59,7 @@ let # - metal if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) # !! warn if multiple acceleration methods are enabled and default to the first one in the list featureDevice = - if (builtins.isNull acceleration) then + if (isNull acceleration) then (warnIfMultipleAccelerationMethods availableAccelerations) else acceleration; diff --git a/pkgs/by-name/te/tela-circle-icon-theme/package.nix b/pkgs/by-name/te/tela-circle-icon-theme/package.nix index 5cba50aae8b4..79e5e9bfe70c 100644 --- a/pkgs/by-name/te/tela-circle-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-circle-icon-theme/package.nix @@ -72,7 +72,7 @@ lib.checkListOfEnum "tela-circle-icon-theme: color variants" ./install.sh -d $out/share/icons \ ${lib.optionalString circularFolder "-c"} \ - ${if allColorVariants then "-a" else builtins.toString colorVariants} + ${if allColorVariants then "-a" else toString colorVariants} jdupes --quiet --link-soft --recurse $out/share diff --git a/pkgs/by-name/to/touchosc/update.sh b/pkgs/by-name/to/touchosc/update.sh index dc3e2f088878..88315275bc22 100755 --- a/pkgs/by-name/to/touchosc/update.sh +++ b/pkgs/by-name/to/touchosc/update.sh @@ -24,7 +24,7 @@ nixeval() { 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}" diff --git a/pkgs/by-name/tr/treecat/package.nix b/pkgs/by-name/tr/treecat/package.nix index bb983196e8ab..20b4592f56ee 100644 --- a/pkgs/by-name/tr/treecat/package.nix +++ b/pkgs/by-name/tr/treecat/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { scdoc ]; - env.PREFIX = builtins.placeholder "out"; + env.PREFIX = placeholder "out"; dontConfigure = true; diff --git a/pkgs/by-name/tr/treefmt/functions-doc.nix b/pkgs/by-name/tr/treefmt/functions-doc.nix index 86dc23b226ea..f02ba13abb66 100644 --- a/pkgs/by-name/tr/treefmt/functions-doc.nix +++ b/pkgs/by-name/tr/treefmt/functions-doc.nix @@ -24,7 +24,7 @@ in { locations = lib.pipe attrs [ builtins.attrNames - (builtins.map ( + (map ( name: let pos = builtins.unsafeGetAttrPos name attrs; diff --git a/pkgs/by-name/tr/treefmt/options-doc.nix b/pkgs/by-name/tr/treefmt/options-doc.nix index f9e51ec0dff1..c0e14ba4e71c 100644 --- a/pkgs/by-name/tr/treefmt/options-doc.nix +++ b/pkgs/by-name/tr/treefmt/options-doc.nix @@ -26,6 +26,6 @@ let in nixosOptionsDoc { documentType = "none"; - options = builtins.removeAttrs configuration.options [ "_module" ]; + options = removeAttrs configuration.options [ "_module" ]; transformOptions = opt: opt // { declarations = map transformDeclaration opt.declarations; }; } diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index 84593c31a908..bbe124f2c371 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -44,7 +44,7 @@ let "AMDGPU" "NVPTX" ] - ++ builtins.map inferNativeTarget llvmTargetsToBuild; + ++ map inferNativeTarget llvmTargetsToBuild; # This LLVM version can't seem to find pygments/pyyaml, # but a later update will likely fix this (triton-2.1.0) diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix index 6dea8a577f28..284fcdc68cf4 100644 --- a/pkgs/by-name/uc/ucc/package.nix +++ b/pkgs/by-name/uc/ucc/package.nix @@ -86,7 +86,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { # NOTE: With `__structuredAttrs` enabled, `LDFLAGS` must be set under `env` so it is assured to be a string; # otherwise, we might have forgotten to convert it to a string and Nix would make LDFLAGS a shell variable # referring to an array! - env.LDFLAGS = builtins.toString ( + env.LDFLAGS = toString ( optionals enableCuda [ # Fake libnvidia-ml.so (the real one is deployed impurely) "-L${getLib cuda_nvml_dev}/lib/stubs" diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix index 0f8fe4f8c98b..f5c5e3917ea8 100644 --- a/pkgs/by-name/uw/uwsgi/package.nix +++ b/pkgs/by-name/uw/uwsgi/package.nix @@ -76,7 +76,7 @@ let else throw "Unknown UWSGI plugin ${name}, available : ${all}"; - needed = builtins.map getPlugin plugins; + needed = map getPlugin plugins; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix index 4c336c2c1204..5d5ccf4b8147 100644 --- a/pkgs/by-name/va/vanillatd/package.nix +++ b/pkgs/by-name/va/vanillatd/package.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { rsync --archive --mkpath --chmod=a+w ${finalAttrs.finalPackage}/ $out/ # Symlink the data derivation to the default data path - mkdir -p ${builtins.dirOf Default_Data_Path} + mkdir -p ${dirOf Default_Data_Path} ln -s ${dataDerivation} ${Default_Data_Path} # Fix `error: suspicious ownership or permission on '/nix/store/xxx-0.0.0' for output 'out'; rejecting this build output` diff --git a/pkgs/by-name/vi/vimix-gtk-themes/package.nix b/pkgs/by-name/vi/vimix-gtk-themes/package.nix index 0231a5dccbd4..72f667148a5f 100644 --- a/pkgs/by-name/vi/vimix-gtk-themes/package.nix +++ b/pkgs/by-name/vi/vimix-gtk-themes/package.nix @@ -76,10 +76,10 @@ lib.checkListOfEnum "${pname}: theme variants" runHook preInstall mkdir -p $out/share/themes name= HOME="$TMPDIR" ./install.sh \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \ --dest $out/share/themes rm $out/share/themes/*/{AUTHORS,LICENSE} jdupes --quiet --link-soft --recurse $out/share diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix index 9c23826a48f5..5d39400df9c4 100644 --- a/pkgs/by-name/vi/vimix-icon-theme/package.nix +++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix @@ -61,7 +61,7 @@ lib.checkListOfEnum "${pname}: color variants" runHook preInstall ./install.sh \ - ${if colorVariants != [ ] then builtins.toString colorVariants else "-a"} \ + ${if colorVariants != [ ] then toString colorVariants else "-a"} \ -d $out/share/icons # replace duplicate files with symlinks diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix index 9b58b0ca2f05..c5c5204454f7 100644 --- a/pkgs/by-name/wa/wasilibc/package.nix +++ b/pkgs/by-name/wa/wasilibc/package.nix @@ -33,9 +33,9 @@ stdenvNoLibc.mkDerivation (finalAttrs: { ''; preBuild = '' - export SYSROOT_LIB=${builtins.placeholder "out"}/lib - export SYSROOT_INC=${builtins.placeholder "dev"}/include - export SYSROOT_SHARE=${builtins.placeholder "share"}/share + export SYSROOT_LIB=${placeholder "out"}/lib + export SYSROOT_INC=${placeholder "dev"}/include + export SYSROOT_SHARE=${placeholder "share"}/share mkdir -p "$SYSROOT_LIB" "$SYSROOT_INC" "$SYSROOT_SHARE" makeFlagsArray+=( "SYSROOT_LIB:=$SYSROOT_LIB" diff --git a/pkgs/by-name/wg/wgpu-native/examples.nix b/pkgs/by-name/wg/wgpu-native/examples.nix index d51db484124b..71619d101641 100644 --- a/pkgs/by-name/wg/wgpu-native/examples.nix +++ b/pkgs/by-name/wg/wgpu-native/examples.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ]; makeWrapperArgs = lib.optionals (finalAttrs.runtimeInputs != [ ]) [ - "--prefix LD_LIBRARY_PATH : ${builtins.toString (lib.makeLibraryPath finalAttrs.runtimeInputs)}" + "--prefix LD_LIBRARY_PATH : ${toString (lib.makeLibraryPath finalAttrs.runtimeInputs)}" ]; installPhase = '' diff --git a/pkgs/by-name/wh/whitesur-icon-theme/package.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix index 31b620f635e2..8a4c7cfd5def 100644 --- a/pkgs/by-name/wh/whitesur-icon-theme/package.nix +++ b/pkgs/by-name/wh/whitesur-icon-theme/package.nix @@ -61,7 +61,7 @@ lib.checkListOfEnum "${pname}: theme variants" ./install.sh --dest $out/share/icons \ --name WhiteSur \ - --theme ${builtins.toString themeVariants} \ + --theme ${toString themeVariants} \ ${lib.optionalString alternativeIcons "--alternative"} \ ${lib.optionalString boldPanelIcons "--bold"} \ diff --git a/pkgs/by-name/xe/xevd/package.nix b/pkgs/by-name/xe/xevd/package.nix index fc5c80e31bbb..a98cfbecf0d9 100644 --- a/pkgs/by-name/xe/xevd/package.nix +++ b/pkgs/by-name/xe/xevd/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = lib.optionals (!lib.versionOlder "0.5.0" finalAttrs.version) ( - builtins.map fetchpatch2 [ + map fetchpatch2 [ # Upstream accepted patches, should be dropped on next version bump. { url = "https://github.com/mpeg5/xevd/commit/7eda92a6ebb622189450f7b63cfd4dcd32fd6dff.patch?full_index=1"; @@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: { optional isAarch64 (cmakeBool "ARM" true) ++ optional isDarwin (cmakeFeature "CMAKE_SYSTEM_NAME" "Darwin"); - env.NIX_CFLAGS_COMPILE = builtins.toString ( - builtins.map (w: "-Wno-" + w) ( + env.NIX_CFLAGS_COMPILE = toString ( + map (w: "-Wno-" + w) ( [ # Evaluate on version bump whether still necessary. "sometimes-uninitialized" diff --git a/pkgs/by-name/xe/xeve/package.nix b/pkgs/by-name/xe/xeve/package.nix index f7513d9c1298..0b478314be39 100644 --- a/pkgs/by-name/xe/xeve/package.nix +++ b/pkgs/by-name/xe/xeve/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = - builtins.map fetchpatch2 [ + map fetchpatch2 [ { url = "https://github.com/mpeg5/xeve/commit/954ed6e0494cd2438fd15c717c0146e88e582b33.patch?full_index=1"; hash = "sha256-//NtOUm1fqPFvOM955N6gF+QgmOdmuVunwx/3s/G/J8="; @@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: { optional isAarch64 (cmakeBool "ARM" true) ++ optional isDarwin (cmakeFeature "CMAKE_SYSTEM_NAME" "Darwin"); - env.NIX_CFLAGS_COMPILE = builtins.toString ( - builtins.map (w: "-Wno-" + w) [ + env.NIX_CFLAGS_COMPILE = toString ( + map (w: "-Wno-" + w) [ # Patch addressing an if without a body was rejected upstream, third # line-based comment in this thread, https://github.com/mpeg5/xeve/pull/122#pullrequestreview-2187744305 # Evaluate on version bump whether still necessary. diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix index 1f974022d373..fe0e48d2f95c 100644 --- a/pkgs/by-name/xg/xgboost/package.nix +++ b/pkgs/by-name/xg/xgboost/package.nix @@ -30,7 +30,7 @@ let # #226165 rewrites cudaStdenv effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; # Ensures we don't use the stdenv value by accident. - stdenv = builtins.throw "Use effectiveStdenv instead of stdenv in xgboost derivation."; + stdenv = throw "Use effectiveStdenv instead of stdenv in xgboost derivation."; in effectiveStdenv.mkDerivation rec { diff --git a/pkgs/by-name/ya/yandex-cloud/update.py b/pkgs/by-name/ya/yandex-cloud/update.py index d1b95ca50ec6..d6309118bf92 100644 --- a/pkgs/by-name/ya/yandex-cloud/update.py +++ b/pkgs/by-name/ya/yandex-cloud/update.py @@ -38,7 +38,7 @@ package_attrs = json.loads(subprocess.run( "--json", "--file", nixpkgs_path, "--apply", """p: { - dir = builtins.dirOf p.meta.position; + dir = dirOf p.meta.position; version = p.version; }""", "--", diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index a1e95af55ab6..28ab7abb556f 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -115,11 +115,11 @@ stdenv.mkDerivation rec { in '' runHook preBuild - make ${builtins.toString makeOptsCommon} -C apps/xtractor - make ${builtins.toString makeOptsCommon} -C apps/zxtune123 + make ${toString makeOptsCommon} -C apps/xtractor + make ${toString makeOptsCommon} -C apps/zxtune123 '' + lib.optionalString withQt '' - make ${builtins.toString (makeOptsCommon ++ makeOptsQt)} -C apps/zxtune-qt + make ${toString (makeOptsCommon ++ makeOptsQt)} -C apps/zxtune-qt '' + '' runHook postBuild diff --git a/pkgs/common-updater/combinators.nix b/pkgs/common-updater/combinators.nix index eafc530ceaed..e857f0fb4b88 100644 --- a/pkgs/common-updater/combinators.nix +++ b/pkgs/common-updater/combinators.nix @@ -52,7 +52,7 @@ let arg: if builtins.isPath arg then { - args = args ++ [ { __rawShell = "\"\$${builtins.toString maxArgIndex}\""; } ]; + args = args ++ [ { __rawShell = "\"\$${toString maxArgIndex}\""; } ]; maxArgIndex = maxArgIndex + 1; paths = paths ++ [ arg ]; } @@ -144,7 +144,7 @@ rec { scripts: let - scriptsNormalized = builtins.map normalize scripts; + scriptsNormalized = map normalize scripts; in let scripts = scriptsNormalized; @@ -174,7 +174,7 @@ rec { builtins.length ( lib.unique ( builtins.filter (attrPath: attrPath != null) ( - builtins.map ( + map ( { attrPath ? null, ... @@ -187,7 +187,7 @@ rec { ) "Combining update scripts with different attr paths is currently unsupported."; { - command = commandsToShellInvocation (builtins.map ({ command, ... }: command) scripts); + command = commandsToShellInvocation (map ({ command, ... }: command) scripts); supportedFeatures = if hasCommitSupport then [ "commit" ] diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix index 9727fabd0096..8897e93616a3 100644 --- a/pkgs/common-updater/unstable-updater.nix +++ b/pkgs/common-updater/unstable-updater.nix @@ -164,7 +164,7 @@ let in [ (lib.getExe updateScript) - "--url=${builtins.toString url}" + "--url=${toString url}" "--tag-format=${tagFormat}" ] ++ lib.optionals (branch != null) [ diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index 52974e657f9d..7269a62c2837 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -73,7 +73,7 @@ let }); in builtins.listToAttrs ( - builtins.map (set: { + map (set: { name = set; value = makeIosevkaFont set; }) sets diff --git a/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix b/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix index 318a65309921..4419eeb25138 100644 --- a/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix +++ b/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix @@ -27,11 +27,11 @@ let stdenv.mkDerivation { pname = "gnome-shell-extension-${pname}"; - version = builtins.toString version; + version = toString version; src = fetchzip { url = "https://extensions.gnome.org/extension-data/${ builtins.replaceStrings [ "@" ] [ "" ] uuid - }.v${builtins.toString version}.shell-extension.zip"; + }.v${toString version}.shell-extension.zip"; inherit sha256; stripRoot = false; # The download URL may change content over time. This is because the diff --git a/pkgs/desktops/gnome/update.nix b/pkgs/desktops/gnome/update.nix index 481aeb831542..94b36c9227dc 100644 --- a/pkgs/desktops/gnome/update.nix +++ b/pkgs/desktops/gnome/update.nix @@ -29,7 +29,7 @@ let minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null; nextMinor = builtins.fromJSON minorVersion + 1; - upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; + upperBound = "${lib.versions.major packageVersion}.${toString nextMinor}"; in if builtins.isBool freeze then lib.optionals (freeze && minorAvailable) [ upperBound ] diff --git a/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix index 9c89a3279396..50115d09e14d 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Powerful and easy to use calculator for Ubuntu Touch, with calculations history and formula validation"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app"; changelog = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = lib.licenses.gpl3Only; mainProgram = "lomiri-calculator-app"; diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix index cb7b7ca5e07e..d35e0045c989 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "File Manager application for Ubuntu Touch devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app"; changelog = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = lib.licenses.gpl3Only; mainProgram = "lomiri-filemanager-app"; diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix index 2c8c6f1b6293..7ab53bf38eb2 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Photo gallery application for Ubuntu Touch devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app"; changelog = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = with lib.licenses; [ gpl3Only diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix index ed9a987e4ae3..2e02c75ab969 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Media Player application for Ubuntu Touch devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app"; changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = with lib.licenses; [ gpl3Only diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix index 49fc854d2fff..6771c1e29f7b 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Default Music application for Ubuntu devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-music-app"; changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = with lib.licenses; [ gpl3Only diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index b1bcd75d3a48..4b5b90001e50 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { description = "System Settings application for Lomiri"; homepage = "https://gitlab.com/ubports/development/core/lomiri-system-settings"; changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = licenses.gpl3Only; mainProgram = "lomiri-system-settings"; diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix index ed6ebd0a68a0..cd47cbec28cd 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Terminal app for desktop and mobile devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app"; changelog = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = lib.licenses.gpl3Only; mainProgram = "lomiri-terminal-app"; diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix index cfc8b18cbc09..509e569123c1 100644 --- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Performs uploads and downloads from a centralized location"; homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager"; changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = lib.licenses.lgpl3Only; teams = [ lib.teams.lomiri ]; diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 34616ac586fc..2e8f725a3c9d 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Ayatana indiator exporting the network settings menu through D-Bus"; homepage = "https://gitlab.com/ubports/development/core/lomiri-indicator-network"; changelog = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = lib.licenses.gpl3Only; teams = [ lib.teams.lomiri ]; diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix index fce7f3ec2836..5326211f9793 100644 --- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Policy kit agent for the Lomiri desktop"; homepage = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent"; changelog = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = lib.licenses.gpl3Only; teams = [ lib.teams.lomiri ]; diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix index d7a1e7003c98..d28de698e310 100644 --- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher"; changelog = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = with lib.licenses; [ lgpl3Only diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index b8391e001a17..2fd3c1ca05b1 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Media scanner service & access library"; homepage = "https://gitlab.com/ubports/development/core/mediascanner2"; changelog = "https://gitlab.com/ubports/development/core/mediascanner2/-/blob/${ - if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev }/ChangeLog"; license = lib.licenses.gpl3Only; teams = [ lib.teams.lomiri ]; diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index 18772e8cac6d..1f0a82871ea0 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -78,7 +78,7 @@ let thisSpark = spark2014.${gnat_version} - or (builtins.throw "GNATprove depends on a specific GNAT version and can't be built using GNAT ${gnat_version}."); + or (throw "GNATprove depends on a specific GNAT version and can't be built using GNAT ${gnat_version}."); in stdenv.mkDerivation { diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index ffc5e6a58979..05d2aa81bae9 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -86,7 +86,7 @@ }@attrs: let # Remove non standard attributes that cannot be coerced to strings - overridable = builtins.removeAttrs attrs [ + overridable = removeAttrs attrs [ "compileFlags" "erlangCompilerOptions" "mixNixDeps" diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix index cf361be35b90..dc3c3bb07dd1 100644 --- a/pkgs/development/compilers/chicken/4/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ( } // args.meta or { }; } - // (builtins.removeAttrs args [ + // (removeAttrs args [ "name" "buildInputs" "meta" diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index a4da9793a1b4..6629a30ad973 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -78,7 +78,7 @@ in } // args.meta or { }; } - // builtins.removeAttrs args [ + // removeAttrs args [ "name" "pname" "version" diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index c7c29f12caa4..7914b7d7771e 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -41,7 +41,7 @@ assert ( ] ); let - mkDerivationArgs = builtins.removeAttrs args [ + mkDerivationArgs = removeAttrs args [ "format" "installManPages" "lockFile" diff --git a/pkgs/development/compilers/gcc/ng/common/default.nix b/pkgs/development/compilers/gcc/ng/common/default.nix index 98ce3bb89c1e..3f2e3b3b189d 100644 --- a/pkgs/development/compilers/gcc/ng/common/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/default.nix @@ -59,12 +59,11 @@ let ; src = monorepoSrc; versionDir = - (builtins.toString ../.) - + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}"; + (toString ../.) + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}"; getVersionFile = p: builtins.path { - name = builtins.baseNameOf p; + name = baseNameOf p; path = let patches = args.patchesFn (import ./patches.nix); diff --git a/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix b/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix index 284792e16830..7b294b56bbae 100644 --- a/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { "gcc_cv_target_thread_file=single" # $CC cannot link binaries, let alone run then "cross_compiling=true" - "--with-toolexeclibdir=${builtins.placeholder "dev"}/lib" + "--with-toolexeclibdir=${placeholder "dev"}/lib" ]; # Set the variable back the way it was, see corresponding code in diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index db97c1e3f54c..7be63b3a0a5f 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -24,7 +24,7 @@ }@args: let - extraArgs = builtins.removeAttrs args [ + extraArgs = removeAttrs args [ "lib" "stdenv" "alsa-lib" diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 5276c5719dbd..b8c061f88c7d 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -14,7 +14,7 @@ }@args: let - extraArgs = builtins.removeAttrs args [ + extraArgs = removeAttrs args [ "lib" "stdenv" "autoPatchelfHook" diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index 40a7d275b7df..9a5a1f2818d7 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -50,7 +50,7 @@ let libSuffix = "lib/${idrName}"; libDirs = libs: (lib.makeSearchPath libSuffix libs) + ":${idris2}/${idrName}"; supportDir = "${idris2}/${idrName}/lib"; - drvAttrs = builtins.removeAttrs attrs [ + drvAttrs = removeAttrs attrs [ "ipkgName" "idrisLibraries" ]; diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 5de10bf97f0e..5a9088864e0d 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -74,12 +74,11 @@ let ; src = monorepoSrc; versionDir = - (builtins.toString ../.) - + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}"; + (toString ../.) + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}"; getVersionFile = p: builtins.path { - name = builtins.baseNameOf p; + name = baseNameOf p; path = let patches = args.patchesFn (import ./patches.nix); diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 279be22f7757..ab080daa1d1a 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -272,7 +272,7 @@ stdenv.mkDerivation ( # and thus fails under the sandbox: '' substituteInPlace unittests/TargetParser/Host.cpp \ - --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers"}" + --replace-fail '/usr/bin/sw_vers' "${(toString darwin.DarwinTools) + "/bin/sw_vers"}" '' + # This test tries to call the intrinsics `@llvm.roundeven.f32` and diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix index 357ffecc6c53..f0cff1818e0e 100644 --- a/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -197,5 +197,5 @@ if (!config.allowAliases && !(vmsByPlatform ? platform)) then else vmsByPlatform.${platform} or (throw ( "Unsupported platform ${platform}: only the following platforms are supported: " - + builtins.toString (builtins.attrNames vmsByPlatform) + + toString (builtins.attrNames vmsByPlatform) )) diff --git a/pkgs/development/compilers/rust/1_89.nix b/pkgs/development/compilers/rust/1_89.nix index 5690db67d8c3..77b5fc06dfc7 100644 --- a/pkgs/development/compilers/rust/1_89.nix +++ b/pkgs/development/compilers/rust/1_89.nix @@ -86,7 +86,7 @@ import ./default.nix } ( - builtins.removeAttrs args [ + removeAttrs args [ "llvmPackages_20" "llvm_20" "wrapCCWith" diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 94bb15d58e70..315016ef7aea 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -218,8 +218,8 @@ stdenv.mkDerivation (self: { "--prefix=$out" "--xc-host=${lib.escapeShellArg bootstrapLisp'}" ] - ++ builtins.map (x: "--with-${x}") self.enableFeatures - ++ builtins.map (x: "--without-${x}") self.disableFeatures + ++ map (x: "--with-${x}") self.enableFeatures + ++ map (x: "--without-${x}") self.disableFeatures ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ "--arch=arm64" ]; diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix index ecd34e60221c..e295437ab236 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix @@ -83,7 +83,7 @@ let binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; - platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms + platforms = map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms maintainers = with maintainers; [ taku0 ]; teams = [ teams.java ]; inherit knownVulnerabilities; diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index 9b1cb142f5f8..33855e06f467 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -139,7 +139,7 @@ let binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; - platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms + platforms = map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms maintainers = with maintainers; [ taku0 ]; teams = [ teams.java ]; inherit knownVulnerabilities; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index b494ce36ab12..586657b523f4 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -104,7 +104,7 @@ let let roundUpToEven = num: num + lib.mod num 2; in - "vala_${lib.versions.major version}_${builtins.toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}"; + "vala_${lib.versions.major version}_${toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}"; packageName = "vala"; freeze = true; }; diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix index 6f5d0b66767a..0ff3cb7e1c56 100644 --- a/pkgs/development/compilers/zulu/11.nix +++ b/pkgs/development/compilers/zulu/11.nix @@ -50,5 +50,5 @@ callPackage ./common.nix ( }; }; } - // builtins.removeAttrs args [ "callPackage" ] + // removeAttrs args [ "callPackage" ] ) diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix index 622f75365b4f..45abea1fc783 100644 --- a/pkgs/development/compilers/zulu/17.nix +++ b/pkgs/development/compilers/zulu/17.nix @@ -50,5 +50,5 @@ callPackage ./common.nix ( }; }; } - // builtins.removeAttrs args [ "callPackage" ] + // removeAttrs args [ "callPackage" ] ) diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix index 21516f45b3d2..cd9bbcb509a6 100644 --- a/pkgs/development/compilers/zulu/21.nix +++ b/pkgs/development/compilers/zulu/21.nix @@ -51,5 +51,5 @@ callPackage ./common.nix ( }; }; } - // builtins.removeAttrs args [ "callPackage" ] + // removeAttrs args [ "callPackage" ] ) diff --git a/pkgs/development/compilers/zulu/23.nix b/pkgs/development/compilers/zulu/23.nix index 512a0f0813d0..836d545ab2af 100644 --- a/pkgs/development/compilers/zulu/23.nix +++ b/pkgs/development/compilers/zulu/23.nix @@ -50,5 +50,5 @@ callPackage ./common.nix ( }; }; } - // builtins.removeAttrs args [ "callPackage" ] + // removeAttrs args [ "callPackage" ] ) diff --git a/pkgs/development/compilers/zulu/24.nix b/pkgs/development/compilers/zulu/24.nix index 2bedd55b0093..36a545742d06 100644 --- a/pkgs/development/compilers/zulu/24.nix +++ b/pkgs/development/compilers/zulu/24.nix @@ -51,5 +51,5 @@ callPackage ./common.nix ( }; }; } - // builtins.removeAttrs args [ "callPackage" ] + // removeAttrs args [ "callPackage" ] ) diff --git a/pkgs/development/compilers/zulu/25.nix b/pkgs/development/compilers/zulu/25.nix index e0be95086313..19808de0a0af 100644 --- a/pkgs/development/compilers/zulu/25.nix +++ b/pkgs/development/compilers/zulu/25.nix @@ -54,5 +54,5 @@ callPackage ./common.nix ( }; }; } - // builtins.removeAttrs args [ "callPackage" ] + // removeAttrs args [ "callPackage" ] ) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 03a6b1c211c4..fff0903db91c 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -50,5 +50,5 @@ callPackage ./common.nix ( }; }; } - // builtins.removeAttrs args [ "callPackage" ] + // removeAttrs args [ "callPackage" ] ) diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix index a433a52c7394..529716220351 100644 --- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix @@ -75,7 +75,7 @@ in buildInputs = prevAttrs.buildInputs or [ ] ++ [ cutensor ]; cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [ - "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin" + "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${placeholder "out"}/bin" ]; # CUTENSOR_ROOT is double escaped diff --git a/pkgs/development/hare-third-party/hare-compress/default.nix b/pkgs/development/hare-third-party/hare-compress/default.nix index d9065f3bcd2c..ce9103cddfe1 100644 --- a/pkgs/development/hare-third-party/hare-compress/default.nix +++ b/pkgs/development/hare-third-party/hare-compress/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ hareHook ]; - makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; doCheck = true; diff --git a/pkgs/development/hare-third-party/hare-ev/default.nix b/pkgs/development/hare-third-party/hare-ev/default.nix index d7a004954f96..42b6044ca49b 100644 --- a/pkgs/development/hare-third-party/hare-ev/default.nix +++ b/pkgs/development/hare-third-party/hare-ev/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeCheckInputs = [ hareHook ]; - makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; doCheck = true; diff --git a/pkgs/development/hare-third-party/hare-json/default.nix b/pkgs/development/hare-third-party/hare-json/default.nix index a96de33b914a..a1ce306c3615 100644 --- a/pkgs/development/hare-third-party/hare-json/default.nix +++ b/pkgs/development/hare-third-party/hare-json/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ hareHook ]; - makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; doCheck = true; diff --git a/pkgs/development/hare-third-party/hare-png/default.nix b/pkgs/development/hare-third-party/hare-png/default.nix index fba410eb8ffd..1eb6072dfe2e 100644 --- a/pkgs/development/hare-third-party/hare-png/default.nix +++ b/pkgs/development/hare-third-party/hare-png/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ hareHook ]; propagatedBuildInputs = [ hareThirdParty.hare-compress ]; - makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; doCheck = true; diff --git a/pkgs/development/hare-third-party/hare-ssh/default.nix b/pkgs/development/hare-third-party/hare-ssh/default.nix index bf6e043fb977..8e29c6965c58 100644 --- a/pkgs/development/hare-third-party/hare-ssh/default.nix +++ b/pkgs/development/hare-third-party/hare-ssh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ hareHook ]; - makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; doCheck = true; diff --git a/pkgs/development/hare-third-party/hare-toml/default.nix b/pkgs/development/hare-third-party/hare-toml/default.nix index cce8f8f744ca..0002db4c2fc2 100644 --- a/pkgs/development/hare-third-party/hare-toml/default.nix +++ b/pkgs/development/hare-third-party/hare-toml/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { hareHook ]; - makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; checkTarget = "check_local"; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index f2ea85774d60..6bcc21de75d7 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -392,9 +392,9 @@ let # closePropagationFast. propagatePlainBuildInputs = drvs: - builtins.map (i: i.val) ( + map (i: i.val) ( builtins.genericClosure { - startSet = builtins.map (drv: { + startSet = map (drv: { key = drv.outPath; val = drv; }) (builtins.filter propagateValue drvs); @@ -784,7 +784,7 @@ lib.fix ( checkFlagsArray+=( "--show-details=streaming" "--test-wrapper=${testWrapperScript}" - ${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)} + ${lib.escapeShellArgs (map (opt: "--test-option=${opt}") testFlags)} ) export NIX_GHC_PACKAGE_PATH_FOR_TEST="''${NIX_GHC_PACKAGE_PATH_FOR_TEST:-$packageConfDir:}" ${setupCommand} test ${testTargetsString} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 1ec268e78c36..fb5d8bcb7dae 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -87,7 +87,7 @@ buildPackages.stdenv.mkDerivation (finalAttrs: { '') ( lib.filter (el: el.haddockDir != null) ( - builtins.map (p: { + map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null; name = p.pname; }) docPackages diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 30cac6779ff7..220cb49f3d91 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -662,9 +662,9 @@ rec { # closePropagationFast. propagatedPlainBuildInputs = drvs: - builtins.map (i: i.val) ( + map (i: i.val) ( builtins.genericClosure { - startSet = builtins.map (drv: { + startSet = map (drv: { key = drv.outPath; val = drv; }) drvs; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 0d936b21f41d..01d434a658ae 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -351,7 +351,7 @@ package-set { inherit pkgs lib callPackage; } self developPackage = { root, - name ? lib.optionalString (builtins.typeOf root == "path") (builtins.baseNameOf root), + name ? lib.optionalString (builtins.typeOf root == "path") (baseNameOf root), source-overrides ? { }, overrides ? self: super: { }, modifier ? drv: drv, @@ -634,7 +634,7 @@ package-set { inherit pkgs lib callPackage; } self # pkgWithCombinedDepsDevDrv :: Derivation pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; }; - mkDerivationArgs = builtins.removeAttrs args [ + mkDerivationArgs = removeAttrs args [ "genericBuilderArgsModifier" "packages" "withHoogle" diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index aba7c109a6b3..f95ca4b2e717 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -63,7 +63,7 @@ let docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.concatLists ( - builtins.map (pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ]) ( + map (pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ]) ( lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages) ) ); diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 01e567769575..f50997fbf337 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -26,7 +26,7 @@ let allIdrisDeps = idrisDeps ++ lib.optional (!noPrelude) prelude ++ lib.optional (!noBase) base; idris-with-packages = with-packages allIdrisDeps; newAttrs = - builtins.removeAttrs attrs [ + removeAttrs attrs [ "idrisDeps" "noPrelude" "noBase" diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index b3e8b339c47c..7b2ef292fc42 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation { ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" ++ lib.optional ffcallAvailable "--with-ffcall" ++ lib.optional (!ffcallAvailable) "--without-ffcall" - ++ builtins.map (x: " --with-module=" + x) withModules + ++ map (x: " --with-module=" + x) withModules ++ lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index aab69c1db2dc..09a1eb96ea84 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -52,7 +52,7 @@ let See https://hexdocs.pm/elixir/${version}/compatibility-and-deprecations.html ''; - maxShiftMajor = builtins.toString ((toInt (versions.major maximumOTPVersion)) + 1); + maxShiftMajor = toString ((toInt (versions.major maximumOTPVersion)) + 1); maxAssert = if (maximumOTPVersion == null) then true diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix index 507b26931473..66bab3c03b14 100644 --- a/pkgs/development/interpreters/octave/build-octave-package.nix +++ b/pkgs/development/interpreters/octave/build-octave-package.nix @@ -72,7 +72,7 @@ let # This used to mean that if a package defined extra nativeBuildInputs, it # would override the ones for building an Octave package (the hook and Octave # itself, causing everything to fail. - attrs' = builtins.removeAttrs attrs [ + attrs' = removeAttrs attrs [ "nativeBuildInputs" "passthru" ]; diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 34ace067ea6c..0279576ce299 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -85,7 +85,7 @@ let }@innerArgs: let allArgs = args // prevArgs // innerArgs; - filteredArgs = builtins.removeAttrs allArgs [ + filteredArgs = removeAttrs allArgs [ "extensions" "extraConfig" ]; diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix index a3c3cd30ceb8..06421ff9b63a 100644 --- a/pkgs/development/interpreters/python/conda/default.nix +++ b/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 diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 0b2a3e1a59d8..47c372fbd3b6 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/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" diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 5fd2c6e91dad..caaed105da48 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/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" diff --git a/pkgs/development/interpreters/ruby/ruby-version.nix b/pkgs/development/interpreters/ruby/ruby-version.nix index 8b8bebc9ec42..68db535d5857 100644 --- a/pkgs/development/interpreters/ruby/ruby-version.nix +++ b/pkgs/development/interpreters/ruby/ruby-version.nix @@ -76,7 +76,7 @@ let else base; - # Implements the builtins.toString interface. + # Implements the toString interface. __toString = self: self.majMinTiny diff --git a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix index 7a842ffd79a7..aae8369cab20 100644 --- a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix +++ b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix @@ -41,7 +41,7 @@ let self = ( stdenv.mkDerivation ( - (builtins.removeAttrs attrs [ + (removeAttrs attrs [ "addTclConfigureFlags" "checkPhase" "checkInputs" diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index 9436d6b30ad0..ff945e9d3d9f 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -15,7 +15,7 @@ python3, }: let - cleanArgs = lib.flip builtins.removeAttrs [ + cleanArgs = lib.flip removeAttrs [ "name" "sourceRoot" "nativeBuildInputs" diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index d47af97f191f..bd61f72fc28e 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -83,7 +83,7 @@ makeFlags = (previousAttrs.makeFlags or [ ]) ++ [ "localedata/install-locales" - "localedir=${builtins.placeholder "out"}/lib/locale" + "localedir=${placeholder "out"}/lib/locale" ]; installPhase = '' diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 3e83fd7eba50..67ad4ff31d6a 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -16,13 +16,13 @@ let # ensure that `.override` works - args = builtins.removeAttrs _args [ + args = removeAttrs _args [ "buildPackages" "targetPackages" "gobject-introspection-unwrapped" ]; # passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override`` - argsForTarget = builtins.removeAttrs args [ "stdenv" ]; + argsForTarget = removeAttrs args [ "stdenv" ]; overriddenUnwrappedGir = gobject-introspection-unwrapped.override args; # if we have targetPackages.gobject-introspection then propagate that diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 514fe0155826..5d124432e4f8 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # While "out" acts as the bin output, most packages only care about the lib output. # We set prefix such that all the pkg-config configuration stays inside the dev and lib outputs. # stdenv will take care of overriding bindir, sbindir, etc. such that "out" contains the binaries. - prefix = builtins.placeholder "lib"; + prefix = placeholder "lib"; env = lib.optionalAttrs stdenv.hostPlatform.isStatic { NIX_CFLAGS_COMPILE = "-fcommon"; diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix index cd8bc263b33a..5dbd4e287070 100644 --- a/pkgs/development/libraries/libint/default.nix +++ b/pkgs/development/libraries/libint/default.nix @@ -75,29 +75,29 @@ assert (eri3Deriv >= 0 && eri3Deriv <= 4); # Ensure valid arguments for generated angular momenta in ERI derivatives are used. assert ( builtins.length eriAm == eriDeriv + 1 - && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eriAm) + && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eriAm) ); assert ( builtins.length eri3Am == eriDeriv + 1 - && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri3Am) + && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eri3Am) ); assert ( builtins.length eri2Am == eriDeriv + 1 - && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri2Am) + && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eri2Am) ); # Ensure valid arguments for generated angular momenta in optimised ERI derivatives are used. assert ( builtins.length eriOptAm == eriDeriv + 1 - && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eriOptAm) + && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eriOptAm) ); assert ( builtins.length eri3OptAm == eriDeriv + 1 - && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri3OptAm) + && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eri3OptAm) ); assert ( builtins.length eri2OptAm == eriDeriv + 1 - && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri2OptAm) + && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eri2OptAm) ); # Ensure a valid derivative order for one-electron integrals @@ -185,26 +185,26 @@ let ]; configureFlags = [ - "--with-max-am=${builtins.toString maxAm}" - "--with-eri-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriAm)}" - "--with-eri3-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3Am)}" - "--with-eri2-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2Am)}" - "--with-eri-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriOptAm)}" - "--with-eri3-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3OptAm)}" - "--with-eri2-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2OptAm)}" + "--with-max-am=${toString maxAm}" + "--with-eri-max-am=${lib.concatStringsSep "," (map toString eriAm)}" + "--with-eri3-max-am=${lib.concatStringsSep "," (map toString eri3Am)}" + "--with-eri2-max-am=${lib.concatStringsSep "," (map toString eri2Am)}" + "--with-eri-opt-am=${lib.concatStringsSep "," (map toString eriOptAm)}" + "--with-eri3-opt-am=${lib.concatStringsSep "," (map toString eri3OptAm)}" + "--with-eri2-opt-am=${lib.concatStringsSep "," (map toString eri2OptAm)}" "--with-cartgauss-ordering=${cartGaussOrd}" "--with-shgauss-ordering=${shGaussOrd}" "--with-shell-set=${shellSet}" ] ++ lib.optional enableFMA "--enable-fma" - ++ lib.optional (eriDeriv > 0) "--enable-eri=${builtins.toString eriDeriv}" - ++ lib.optional (eri2Deriv > 0) "--enable-eri2=${builtins.toString eri2Deriv}" - ++ lib.optional (eri3Deriv > 0) "--enable-eri3=${builtins.toString eri3Deriv}" + ++ lib.optional (eriDeriv > 0) "--enable-eri=${toString eriDeriv}" + ++ lib.optional (eri2Deriv > 0) "--enable-eri2=${toString eri2Deriv}" + ++ lib.optional (eri3Deriv > 0) "--enable-eri3=${toString eri3Deriv}" ++ lib.optionals enableOneBody [ - "--enable-1body=${builtins.toString oneBodyDerivOrd}" + "--enable-1body=${toString oneBodyDerivOrd}" "--enable-1body-property-derivs" ] - ++ lib.optional (multipoleOrd > 0) "--with-multipole-max-order=${builtins.toString multipoleOrd}" + ++ lib.optional (multipoleOrd > 0) "--with-multipole-max-order=${toString multipoleOrd}" ++ lib.optional enableGeneric "--enable-generic" ++ lib.optional enableContracted "--enable-contracted-ints" ++ lib.optional eri3PureSh "--enable-eri3-pure-sh" diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 827c16e524b4..f548668644bf 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -120,8 +120,8 @@ let toCommand = dep: "ln -s ${dep} $out/${dep.pname}-${dep.version}.tar.gz"; packageCacheCommand = lib.pipe rustDeps [ - (builtins.map fetchDep) - (builtins.map toCommand) + (map fetchDep) + (map toCommand) (lib.concatStringsSep "\n") ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d23a732a4068..760af40f0ffb 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -193,9 +193,7 @@ let # starting with 3.5 its nice to speed things up for free ++ lib.optional stdenv.hostPlatform.isx86_64 "enable-ec_nistp_64_gcc_128" # useful to set e.g. 256 bit security level with setting this to 5 - ++ lib.optional ( - securityLevel != null - ) "-DOPENSSL_TLS_SECURITY_LEVEL=${builtins.toString securityLevel}" + ++ lib.optional (securityLevel != null) "-DOPENSSL_TLS_SECURITY_LEVEL=${toString securityLevel}" ++ lib.optional enableMD2 "enable-md2" ++ lib.optional enableSSL2 "enable-ssl2" ++ lib.optional enableSSL3 "enable-ssl3" diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index 4cdc80a4090a..26423ac73e7c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -33,7 +33,7 @@ qtModule { # store paths and disallows saving caches of bare qml files in the store. (replaceVars ./invalidate-caches-from-mismatched-store-paths.patch { nixStore = builtins.storeDir; - nixStoreLength = builtins.toString ((builtins.stringLength builtins.storeDir) + 1); # trailing / + nixStoreLength = toString ((builtins.stringLength builtins.storeDir) + 1); # trailing / }) # add version specific QML import path ./use-versioned-import-path.patch @@ -41,7 +41,7 @@ qtModule { preConfigure = let - storePrefixLen = builtins.toString ((builtins.stringLength builtins.storeDir) + 1); + storePrefixLen = toString ((builtins.stringLength builtins.storeDir) + 1); in '' # "NIX:" is reserved for saved qmlc files in patch 0001, "QTDHASH:" takes the place diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index d1482153ffea..7b6598f6ee21 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -134,7 +134,7 @@ rec { # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; - externalDepsDirs = map (x: builtins.toString x) (lib.filter (lib.isDerivation) externalDeps); + externalDepsDirs = map (x: toString x) (lib.filter (lib.isDerivation) externalDeps); generatedConfig = ( { diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index 141d6bb79b47..cdcb11219875 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -27,7 +27,7 @@ rec { phraseDirective = solution: env: name: val: if builtins.isInt val then - builtins.toString val + toString val else if builtins.isString val then name else if true == val then diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 189c85f3cd8b..a58e84ceb76f 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -255,16 +255,14 @@ let mkLicenseTexts = licenseNames: lib.lists.flatten ( - builtins.map ( - licenseName: - builtins.map (licenseText: "--- ${licenseName} ---\n${licenseText}") (mkLicenses licenseName) + map ( + licenseName: map (licenseText: "--- ${licenseName} ---\n${licenseText}") (mkLicenses licenseName) ) licenseNames ); # Converts a license name to a list of license hashes. mkLicenseHashes = - licenseName: - builtins.map (licenseText: builtins.hashString "sha1" licenseText) (mkLicenses licenseName); + licenseName: map (licenseText: builtins.hashString "sha1" licenseText) (mkLicenses licenseName); # The list of all license names we're accepting. Put android-sdk-license there # by default. diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index eb5a48681931..fbb52d65a23b 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -4,7 +4,7 @@ # If you copy this example out of nixpkgs, use these lines instead of the next. # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /* - nixpkgsSource ? (builtins.fetchTarball { + nixpkgsSource ? (fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index 3af80459b347..ead2c48aaf26 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -4,7 +4,7 @@ # If you copy this example out of nixpkgs, use these lines instead of the next. # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /* - nixpkgsSource ? (builtins.fetchTarball { + nixpkgsSource ? (fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index ff745ec1d20d..7fc69c3c1ca8 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -2,7 +2,7 @@ # If you copy this example out of nixpkgs, use these lines instead of the next. # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /* - nixpkgsSource ? (builtins.fetchTarball { + nixpkgsSource ? (fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index db7858ecc8f8..dfc2f74ac83e 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -168,7 +168,7 @@ final: prev: { pulp = prev.pulp.override { # tries to install purescript - npmFlags = builtins.toString [ "--ignore-scripts" ]; + npmFlags = toString [ "--ignore-scripts" ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index 555e336dcfc6..7cd1a3c51013 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -31,7 +31,7 @@ buildDunePackage { atdgen-codec-runtime ]; - meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // { + meta = (removeAttrs atd.meta [ "mainProgram" ]) // { description = "Generates efficient JSON serializers, deserializers and validators"; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index 1c69c85ab4e2..5bc2a9bfe69a 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -17,7 +17,7 @@ let in if lib.versionOlder ocaml.version "4.08" then - builtins.throw "${pname} is not available for OCaml ${ocaml.version}" + throw "${pname} is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { @@ -70,7 +70,7 @@ else license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; homepage = "https://github.com/mirage/ocaml-freestanding"; - platforms = builtins.map ({ arch, os }: "${arch}-${os}") ( + platforms = map ({ arch, os }: "${arch}-${os}") ( cartesianProduct { arch = [ "aarch64" diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix index b6398c4e8470..2c30727e881b 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -18,7 +18,7 @@ buildDunePackage { doCheck = true; checkInputs = [ ounit2 ]; - meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { + meta = (removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { description = "Internationalization library using camomile (i18n)"; }; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index 29cd032dd4b5..c046d5f2c0ea 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -18,5 +18,5 @@ buildDunePackage { doCheck = true; checkInputs = [ ounit2 ]; - meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]; + meta = removeAttrs ocaml_gettext.meta [ "mainProgram" ]; } diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index eb98b5c4337e..638342679241 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -21,7 +21,7 @@ let in if lib.versionOlder ocaml.version minimalOCamlVersion then - builtins.throw "${pname} needs at least OCaml ${minimalOCamlVersion}" + throw "${pname} needs at least OCaml ${minimalOCamlVersion}" else stdenv.mkDerivation { diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index f60dce3935df..fa2e7544a1ec 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -90,10 +90,7 @@ stdenv.mkDerivation (finalAttrs: { let args = lib.strings.concatMapStrings - ( - v: - " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}" - ) + (v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${baseNameOf v.name}") ( with lib.attrsets; [ diff --git a/pkgs/development/python-modules/faiss/default.nix b/pkgs/development/python-modules/faiss/default.nix index 39e34a1879e8..76bb135148f8 100644 --- a/pkgs/development/python-modules/faiss/default.nix +++ b/pkgs/development/python-modules/faiss/default.nix @@ -47,7 +47,7 @@ buildPythonPackage { }; meta = lib.pipe (faiss-build.meta or { }) [ - (lib.flip builtins.removeAttrs [ "mainProgram" ]) + (lib.flip removeAttrs [ "mainProgram" ]) (m: m // { description = "Bindings for faiss, the similarity search library"; }) ]; } diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index c894dd3222d0..83124c0d62b3 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - enabledTestPaths = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; + enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}" ]; pythonImportsCheck = [ "fast_histogram" ]; diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix index f9e293d4a6ba..79c171c9bbe1 100644 --- a/pkgs/development/python-modules/fontpens/default.nix +++ b/pkgs/development/python-modules/fontpens/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fontPens" ] - ++ (builtins.map (s: "fontPens." + s) [ + ++ (map (s: "fontPens." + s) [ "angledMarginPen" "digestPointPen" "flattenPen" diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 8659970f32d1..75fd66a2c678 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { python-packages: (python.withPackages (ps: (python-packages ps) ++ [ ps.hy ])).overrideAttrs (old: { name = "${hy.name}-env"; - meta = lib.mergeAttrs (builtins.removeAttrs hy.meta [ "license" ]) { mainProgram = "hy"; }; + meta = lib.mergeAttrs (removeAttrs hy.meta [ "license" ]) { mainProgram = "hy"; }; }); }; diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix index 212bbbc44ae5..28ed8400ec12 100644 --- a/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { ; }; }; - allTests = builtins.map createTest testCases; + allTests = map createTest testCases; in (lib.attrsets.mergeAttrsList allTests) // { diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 2615ca14450e..8a3c75b815be 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -32,7 +32,7 @@ }: let - installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; + installedPackageRoot = "${placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; version = "0.25.2"; diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix index 211d753d1c94..c3ca94659e24 100644 --- a/pkgs/development/python-modules/sentencepiece/default.nix +++ b/pkgs/development/python-modules/sentencepiece/default.nix @@ -16,5 +16,5 @@ buildPythonPackage rec { sourceRoot = "${src.name}/python"; # sentencepiece installs 'bin' output. - meta = builtins.removeAttrs sentencepiece.meta [ "outputsToInstall" ]; + meta = removeAttrs sentencepiece.meta [ "outputsToInstall" ]; } diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix index a89e43451ec8..662ffffb3f65 100644 --- a/pkgs/development/python-modules/uv/default.nix +++ b/pkgs/development/python-modules/uv/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { substituteInPlace python/uv/_find_uv.py \ --replace-fail \ 'sysconfig.get_path("scripts", scheme=_user_scheme()),' \ - 'sysconfig.get_path("scripts", scheme=_user_scheme()), "${builtins.baseNameOf (lib.getExe uv)}",' + 'sysconfig.get_path("scripts", scheme=_user_scheme()), "${baseNameOf (lib.getExe uv)}",' '' # Sidestep the maturin build system in favour of reusing the binary already built by nixpkgs, # to avoid rebuilding the uv binary for every active python package set. diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix index 8740e7ec96c1..cd521021b7f8 100644 --- a/pkgs/development/python-modules/warp-lang/default.nix +++ b/pkgs/development/python-modules/warp-lang/default.nix @@ -35,7 +35,7 @@ assert libmathdxSupport -> cudaSupport; let effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv; - stdenv = builtins.throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv"; + stdenv = throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv"; version = "1.9.0"; diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 81954e88bb25..043bf9f8dd18 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -478,7 +478,7 @@ let in outer // builtins.listToAttrs ( - builtins.map (arch: { + map (arch: { name = arch; value = scopeForArches [ arch ]; }) outer.clr.gpuTargets diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index c8fb82fa0235..b45fe071041e 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -161,8 +161,8 @@ let findClangNostdlibincPatch = x: ( - (lib.strings.hasSuffix "add-nostdlibinc-flag.patch" (builtins.baseNameOf x)) - || (lib.strings.hasSuffix "clang-at-least-16-LLVMgold-path.patch" (builtins.baseNameOf x)) + (lib.strings.hasSuffix "add-nostdlibinc-flag.patch" (baseNameOf x)) + || (lib.strings.hasSuffix "clang-at-least-16-LLVMgold-path.patch" (baseNameOf x)) ); llvmTargetsFlag = "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${ { @@ -251,7 +251,7 @@ rec { }).overrideAttrs (old: { patches = builtins.filter ( - x: !(lib.strings.hasSuffix "more-openbsd-program-headers.patch" (builtins.baseNameOf x)) + x: !(lib.strings.hasSuffix "more-openbsd-program-headers.patch" (baseNameOf x)) ) old.patches; dontStrip = profilableStdenv; nativeBuildInputs = old.nativeBuildInputs ++ [ diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 0e3c1c4187f2..10ea06c415bd 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -107,7 +107,7 @@ lib.makeOverridable ( in stdenv.mkDerivation ( - (builtins.removeAttrs attrs [ "source" ]) + (removeAttrs attrs [ "source" ]) // { inherit ruby; inherit dontBuild; diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix index 5033a73c515e..ceb81cd2d1b8 100644 --- a/pkgs/development/tools/analysis/binlore/default.nix +++ b/pkgs/development/tools/analysis/binlore/default.nix @@ -136,7 +136,7 @@ rec { + # append lore from package's $out and drv.binlore.${drv.outputName} (last entry wins) '' - for lore_type in ${builtins.toString lore.types}; do + for lore_type in ${toString lore.types}; do if [[ -f "${drv}/nix-support/$lore_type" ]]; then cat "${drv}/nix-support/$lore_type" >> "$out/$lore_type" fi diff --git a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix index 1474d003f70d..9bb4686072fa 100644 --- a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix +++ b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix @@ -26,7 +26,7 @@ in let data' = - builtins.removeAttrs + removeAttrs ( if builtins.isPath data then lib.importJSON data @@ -168,7 +168,7 @@ let sortByVersion = a: b: (builtins.compareVersions a.version b.version) < 0; sortedJarPomList = lib.sort sortByVersion jarPomList; - uniqueVersionFiles = builtins.map ({ i, x }: x) ( + uniqueVersionFiles = map ({ i, x }: x) ( builtins.filter ( { i, x }: i == 0 || (builtins.elemAt sortedJarPomList (i - 1)).version != x.version ) (lib.imap0 (i: x: { inherit i x; }) sortedJarPomList) diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index d0d43b94d82f..12fd33a51480 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -55,7 +55,7 @@ runCommand buildah-unwrapped.name preferLocalBuild = true; - meta = builtins.removeAttrs buildah-unwrapped.meta [ "outputsToInstall" ]; + meta = removeAttrs buildah-unwrapped.meta [ "outputsToInstall" ]; outputs = [ "out" diff --git a/pkgs/development/tools/haskell/ghc-settings-edit/default.nix b/pkgs/development/tools/haskell/ghc-settings-edit/default.nix index 4cd19aebcdd7..5e4395bd1396 100644 --- a/pkgs/development/tools/haskell/ghc-settings-edit/default.nix +++ b/pkgs/development/tools/haskell/ghc-settings-edit/default.nix @@ -11,7 +11,7 @@ mkDerivation { src = builtins.path { path = ./.; name = "source"; - filter = path: _: (builtins.baseNameOf path) != "default.nix"; + filter = path: _: (baseNameOf path) != "default.nix"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 24877ea7f401..95538b766105 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -13,5 +13,5 @@ buildDunePackage { propagatedBuildInputs = [ js_of_ocaml-compiler ]; - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; + meta = removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index d532c2fa43d3..91eb685f0671 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -31,7 +31,7 @@ in ... }@args: let - args' = builtins.removeAttrs args [ + args' = removeAttrs args [ "hash" "pname" ]; @@ -56,7 +56,7 @@ in ) true; assert (lib.throwIf (!(builtins.elem fetcherVersion supportedFetcherVersions)) - "pnpm.fetchDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (builtins.map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion." + "pnpm.fetchDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion." ) true; stdenvNoCC.mkDerivation ( diff --git a/pkgs/development/tools/yarn2nix-moretea/default.nix b/pkgs/development/tools/yarn2nix-moretea/default.nix index dc10d2d51819..9b0aca26bbd0 100644 --- a/pkgs/development/tools/yarn2nix-moretea/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/default.nix @@ -101,7 +101,7 @@ rec { builtins.attrNames pkgConfig ); - postInstall = builtins.map ( + postInstall = map ( key: if (pkgConfig.${key} ? postInstall) then '' @@ -285,7 +285,7 @@ rec { { inherit name; value = mkYarnPackage ( - builtins.removeAttrs attrs [ "packageOverrides" ] + removeAttrs attrs [ "packageOverrides" ] // { inherit src @@ -333,8 +333,7 @@ rec { baseName = unlessNull name "${safeName}-${version}"; workspaceDependenciesTransitive = lib.unique ( - (lib.flatten (builtins.map (dep: dep.workspaceDependencies) workspaceDependencies)) - ++ workspaceDependencies + (lib.flatten (map (dep: dep.workspaceDependencies) workspaceDependencies)) ++ workspaceDependencies ); deps = mkYarnModules { @@ -387,7 +386,7 @@ rec { in stdenv.mkDerivation ( - builtins.removeAttrs attrs [ + removeAttrs attrs [ "yarnNix" "pkgConfig" "workspaceDependencies" diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js index 238fb744ab19..ca03c09821d0 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js @@ -12,7 +12,7 @@ const { execFileSync } = require("child_process"); // // to // -// builtins.fetchGit { +// fetchGit { // url = "https://github.com/srghma/node-shell-quote.git"; // ref = "without_unlicenced_jsonify"; // rev = "1234commit"; @@ -26,7 +26,7 @@ const { execFileSync } = require("child_process"); // // to // -// builtins.fetchGit { +// fetchGit { // url = "https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git"; // ref = "master"; // rev = "1234commit"; @@ -47,7 +47,7 @@ function prefetchgit(url, rev) { function fetchgit(fileName, url, rev, branch, builtinFetchGit) { const repo = builtinFetchGit - ? `builtins.fetchGit ({ + ? `fetchGit ({ url = "${url}"; ref = "${branch}"; rev = "${rev}"; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 0038bffbf2e6..e94887da7ad0 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -93,8 +93,8 @@ let '' + (lib.strings.concatStringsSep "\n" ( map (dep: '' - if ! [[ "${builtins.baseNameOf dep.url}" =~ (PyQt|pyqt) ]]; then - ln -vsf ${dep.path} "$out/${builtins.baseNameOf dep.url}" + if ! [[ "${baseNameOf dep.url}" =~ (PyQt|pyqt) ]]; then + ln -vsf ${dep.path} "$out/${baseNameOf dep.url}" fi '') pythonDeps )); diff --git a/pkgs/games/anki/with-addons.nix b/pkgs/games/anki/with-addons.nix index d47c2c16f316..f7fae980349a 100644 --- a/pkgs/games/anki/with-addons.nix +++ b/pkgs/games/anki/with-addons.nix @@ -99,7 +99,7 @@ symlinkJoin { --set ANKI_ADDONS "${anki-utils.buildAnkiAddonsDir (ankiAddons ++ defaultAddons)}" ''; - meta = builtins.removeAttrs anki.meta [ + meta = removeAttrs anki.meta [ "name" "outputsToInstall" "position" diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index 0af177f0448f..23595aa070c2 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { ]; skipFlag = test: "--skip " + test; in - builtins.concatStringsSep " " (builtins.map skipFlag skipList); + builtins.concatStringsSep " " (map skipFlag skipList); meta = with lib; { description = "Terminal MUD client written in Rust"; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index b70fb9316333..8abe6f904479 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -20,7 +20,7 @@ let base = if stdenv.hostPlatform.is32bit then "linux32" else "linux64"; in prefix + base; - inifile = "linux/v0.${builtins.toString dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}${platformSlug}.ini"; + inifile = "linux/v0.${toString dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}${platformSlug}.ini"; unsupportedVersion = lib.versionOlder dwarf-therapist.maxDfVersion dwarf-fortress.dfVersion; # Used to run dfhack to produce a Therapist ini file for the current memory map. diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index ed17fac29cdf..0275b50039da 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -48,7 +48,7 @@ let ... }@attrs: let - attrs' = builtins.removeAttrs attrs [ + attrs' = removeAttrs attrs [ "plong" "pshort" "pcode" diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix index c881d994cded..39ffc40c1df3 100644 --- a/pkgs/games/shattered-pixel-dungeon/generic.nix +++ b/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -22,7 +22,7 @@ }@attrs: let - cleanAttrs = builtins.removeAttrs attrs [ + cleanAttrs = removeAttrs attrs [ "lib" "stdenv" "makeWrapper" diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 75228d1e36eb..97f989082494 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -161,7 +161,7 @@ let env.LANG = "C.UTF-8"; }; - cleanArgs = builtins.removeAttrs args [ + cleanArgs = removeAttrs args [ "extraBuildInputs" "extraNativeBuildInputs" "extraPropagatedBuildInputs" diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 93888011ba8a..b3b43b9a78c8 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -114,7 +114,7 @@ let } // extraMeta; } - // builtins.removeAttrs args [ "extraMeta" ] + // removeAttrs args [ "extraMeta" ] ) ); diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index e7eae7c7c359..559da3d2c48d 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -137,7 +137,7 @@ let mkdir -p "$out/nix-support" ${lib.concatMapStrings (file: '' - echo "file binary-dist ${installDir}/${builtins.baseNameOf file}" >> "$out/nix-support/hydra-build-products" + echo "file binary-dist ${installDir}/${baseNameOf file}" >> "$out/nix-support/hydra-build-products" '') (filesToInstall ++ builtins.attrNames pythonScriptsToInstall)} runHook postInstall diff --git a/pkgs/os-specific/bsd/freebsd/lib/default.nix b/pkgs/os-specific/bsd/freebsd/lib/default.nix index d8d975ef71ad..ec07808f57d4 100644 --- a/pkgs/os-specific/bsd/freebsd/lib/default.nix +++ b/pkgs/os-specific/bsd/freebsd/lib/default.nix @@ -81,7 +81,7 @@ else if (builtins.isPath patches) then (if (isDir patches) then (lib.filesystem.listFilesRecursive patches) else [ patches ]) else if (builtins.isList patches) then - (lib.flatten (builtins.map consolidatePatches patches)) + (lib.flatten (map consolidatePatches patches)) else throw "Bad patches - must be path or derivation or list thereof"; consolidated = consolidatePatches patches; @@ -115,7 +115,7 @@ ); filteredLines = builtins.filter filterFunc partitionedPatches; derive = patchLines: writeText "freebsd-patch" (lib.concatLines patchLines); - derivedPatches = builtins.map derive filteredLines; + derivedPatches = map derive filteredLines; in derivedPatches; in diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix index 002b9276cf5b..4f4595b1b6fb 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix @@ -40,7 +40,7 @@ mkDerivation rec { env = sys.passthru.env; SYSDIR = "${sys.src}/sys"; - KMODDIR = "${builtins.placeholder "out"}/kernel"; + KMODDIR = "${placeholder "out"}/kernel"; meta = { description = "GPU firmware for FreeBSD drm-kmod"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix index c604ee573628..e18446b1c434 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix @@ -43,7 +43,7 @@ mkDerivation { env = sys.passthru.env; SYSDIR = "${sys.src}/sys"; - KMODDIR = "${builtins.placeholder "out"}/kernel"; + KMODDIR = "${placeholder "out"}/kernel"; meta = { description = "Linux drm driver, ported to FreeBSD"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix index 01e40b9d9144..d8dbf2ffa18b 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix @@ -53,7 +53,7 @@ mkDerivation { makeFlags = [ "STRIP=-s" # flag to install, not command "MK_WERROR=no" - "TESTSDIR=${builtins.placeholder "test"}" + "TESTSDIR=${placeholder "test"}" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "BOOTSTRAPPING=1" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index eeac3be85758..a4a3017a209d 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -122,7 +122,7 @@ lib.makeOverridable ( installPhase = "includesPhase"; dontBuild = true; } - // (builtins.removeAttrs attrs [ "env" ]) + // (removeAttrs attrs [ "env" ]) // { patches = (lib.optionals (attrs.autoPickPatches or true) ( diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix index b788d9a81eb5..9c93d416f6c0 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix @@ -119,11 +119,11 @@ mkDerivation rec { inherit env; passthru.env = env; - KODIR = "${builtins.placeholder "out"}/kernel"; - KMODDIR = "${builtins.placeholder "out"}/kernel"; - DTBDIR = "${builtins.placeholder "out"}/dbt"; + KODIR = "${placeholder "out"}/kernel"; + KMODDIR = "${placeholder "out"}/kernel"; + DTBDIR = "${placeholder "out"}/dbt"; - KERN_DEBUGDIR = "${builtins.placeholder "debug"}/lib/debug"; + KERN_DEBUGDIR = "${placeholder "debug"}/lib/debug"; KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix index dfe82eff271e..52c2d56c00d3 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix @@ -57,7 +57,7 @@ mkDerivation { csu ]; - env.NIX_CFLAGS_COMPILE = builtins.toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-B${csu}/lib" "-Wno-error" ]; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix index 7ef016e6f9f9..e3fd1520049a 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix @@ -103,6 +103,6 @@ lib.makeOverridable ( dontBuild = true; } // lib.optionalAttrs stdenv'.hostPlatform.isStatic { NOLIBSHARED = true; } - // (builtins.removeAttrs attrs [ "extraNativeBuildInputs" ]) + // (removeAttrs attrs [ "extraNativeBuildInputs" ]) ) ) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5f6111e5f7fa..a16ef1cccabe 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -104,7 +104,7 @@ let # and pings all maintainers. # # For further context, see https://github.com/NixOS/nixpkgs/pull/143113#issuecomment-953319957 - basicArgs = builtins.removeAttrs args ( + basicArgs = removeAttrs args ( lib.filter ( x: !(builtins.elem x [ diff --git a/pkgs/os-specific/linux/kernel/mainline.nix b/pkgs/os-specific/linux/kernel/mainline.nix index ac8f75c873eb..0ba9f47e542a 100644 --- a/pkgs/os-specific/linux/kernel/mainline.nix +++ b/pkgs/os-specific/linux/kernel/mainline.nix @@ -29,7 +29,7 @@ let }; args' = - (builtins.removeAttrs args [ "branch" ]) + (removeAttrs args [ "branch" ]) // { inherit src version; isLTS = thisKernel.lts; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix index a6adb130049c..df180c0646eb 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix @@ -115,7 +115,7 @@ kaem.runCommand "${pname}-${version}" ] ); } - // (builtins.removeAttrs env [ "nativeBuildInputs" ]) + // (removeAttrs env [ "nativeBuildInputs" ]) ); passthru.tests.get-version = diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix index 8de6229e8809..4b8dd891b1e3 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix @@ -83,7 +83,7 @@ bootBash.runCommand "${pname}-${version}" ] ); } - // (builtins.removeAttrs env [ "nativeBuildInputs" ]) + // (removeAttrs env [ "nativeBuildInputs" ]) ); passthru.tests.get-version = diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix index 71da482689d6..b3e0208476d6 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix @@ -152,7 +152,7 @@ let "src/posixos.c" ]; - objects = map (x: lib.replaceStrings [ ".c" ] [ ".o" ] (builtins.baseNameOf x)) sources; + objects = map (x: lib.replaceStrings [ ".c" ] [ ".o" ] (baseNameOf x)) sources; in kaem.runCommand "${pname}-${version}" { diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix index ac387537f7dc..8e18b829fc59 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix @@ -66,7 +66,7 @@ let "error.c" ]; - objects = map (x: lib.replaceStrings [ ".c" ] [ ".o" ] (builtins.baseNameOf x)) sources; + objects = map (x: lib.replaceStrings [ ".c" ] [ ".o" ] (baseNameOf x)) sources; in kaem.runCommand "${pname}-${version}" { diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix index 710520b68f91..bbec9847013f 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix @@ -138,7 +138,7 @@ let CC = toString ([ cc ] ++ ccArgs); - stripExt = source: lib.replaceStrings [ ".c" ] [ "" ] (builtins.baseNameOf source); + stripExt = source: lib.replaceStrings [ ".c" ] [ "" ] (baseNameOf source); compile = source: diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix index 4f247197dc13..dcf9b50da37d 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix @@ -77,7 +77,7 @@ rec { # # Neither your store nor your substituters seems to have: # - # ${builtins.placeholder "out"} + # ${placeholder "out"} # # You can create this path from an already-bootstrapped nixpkgs # using the following command: diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix index 84463ef7b133..091436dcf482 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix @@ -51,7 +51,7 @@ derivationWithMeta { ] ); } - // (builtins.removeAttrs env [ "nativeBuildInputs" ]) + // (removeAttrs env [ "nativeBuildInputs" ]) ); meta = with lib; { diff --git a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix index ba6cd71b5e0c..b974c08af984 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix @@ -18,7 +18,7 @@ rec { inherit (buildPlatform) system; inherit (meta) name; } - // (builtins.removeAttrs attrs [ + // (removeAttrs attrs [ "meta" "passthru" ]) @@ -57,7 +57,7 @@ rec { '' target=''${out}''${destination} '' - + lib.optionalString (builtins.dirOf destination == ".") '' + + lib.optionalString (dirOf destination == ".") '' mkdir -p ''${out}''${destinationDir} '' + '' @@ -70,7 +70,7 @@ rec { ]; PATH = lib.makeBinPath [ mescc-tools-extra ]; - destinationDir = builtins.dirOf destination; + destinationDir = dirOf destination; inherit destination; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index e5ad9fd5fd1f..1a84f5c0846e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -77,7 +77,7 @@ let rewritePatch = { from, to }: patch: - runCommandLocal (builtins.baseNameOf patch) + runCommandLocal (baseNameOf patch) { inherit patch; nativeBuildInputs = [ patchutils ]; @@ -249,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: { ... }@args: let - args' = builtins.removeAttrs args [ + args' = removeAttrs args [ "owner" "repo" "rev" @@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; nvidia_x11 = finalAttrs.finalPackage; patches = - (builtins.map (rewritePatch { + (map (rewritePatch { from = "kernel"; to = "kernel-open"; }) patches) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0bf921dd0853..37d2b43f0baf 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -891,11 +891,7 @@ stdenv.mkDerivation (finalAttrs: { disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) # 'or p' is for manually specified buildPackages as they dont have __spliced - ( - builtins.filter (p: p != null) ( - builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs - ) - ); + (builtins.filter (p: p != null) (map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs)); disallowedRequisites = lib.optionals (!withUkify) [ bash diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 1033f50d045d..58d1cc369bc2 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -64,7 +64,7 @@ home-assistant.python.pkgs.buildPythonPackage ( // args.meta or { }; } - // builtins.removeAttrs args [ + // removeAttrs args [ "meta" "nativeCheckInputs" "passthru" diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index ded740920ff7..f527e6a6adb3 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -26,7 +26,7 @@ callPackage ../nginx/generic.nix args rec { fixPatch = patch: let - name = patch.name or (builtins.baseNameOf patch); + name = patch.name or (baseNameOf patch); in runCommand "openresty-${name}" { src = patch; } '' substitute $src $out \ diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix index 9735f5103b24..78672ba69c8a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation ( } // meta; } - // (builtins.removeAttrs args [ + // (removeAttrs args [ "zipHash" "pname" "versionPrefix" diff --git a/pkgs/servers/sql/postgresql/ext/omnigres.nix b/pkgs/servers/sql/postgresql/ext/omnigres.nix index eca3b8721e85..f622001c4d18 100644 --- a/pkgs/servers/sql/postgresql/ext/omnigres.nix +++ b/pkgs/servers/sql/postgresql/ext/omnigres.nix @@ -59,8 +59,8 @@ postgresqlBuildExtension (finalAttrs: { cmakeFlags = [ "-DOPENSSL_CONFIGURED=1" "-DPG_CONFIG=${pgWithExtensions.pg_config}/bin/pg_config" - "-DPostgreSQL_TARGET_EXTENSION_DIR=${builtins.placeholder "out"}/share/postgresql/extension/" - "-DPostgreSQL_TARGET_PACKAGE_LIBRARY_DIR=${builtins.placeholder "out"}/lib/" + "-DPostgreSQL_TARGET_EXTENSION_DIR=${placeholder "out"}/share/postgresql/extension/" + "-DPostgreSQL_TARGET_PACKAGE_LIBRARY_DIR=${placeholder "out"}/lib/" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index bb8a4cb3770e..a16f259a5c37 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -117,7 +117,7 @@ let ); in stdenv.mkDerivation ( - builtins.removeAttrs args [ "bundlerEnvArgs" ] + removeAttrs args [ "bundlerEnvArgs" ] // { pluginName = if name != null then name else "${pname}-${version}"; dontConfigure = true; diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix index a3366707f548..ce8b99cca1af 100644 --- a/pkgs/shells/fish/plugins/build-fish-plugin.nix +++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix @@ -31,7 +31,7 @@ attrs@{ let # Do not pass attributes that are only relevant to buildFishPlugin to mkDerivation. - drvAttrs = builtins.removeAttrs attrs [ + drvAttrs = removeAttrs attrs [ "checkPlugins" "checkFunctionDirs" ]; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index fcfc01d7f890..9d27f6bf40a1 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -275,7 +275,7 @@ rec { drvPath = builtins.unsafeDiscardStringContext pkg.drvPath; license = pkg.meta.license or null; in - builtins.trace "@:drv:${toString drvPath}:${builtins.toString license}:@" val; + builtins.trace "@:drv:${toString drvPath}:${toString license}:@" val; in pkg // { diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 81458cdb0339..4709d53569f0 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -108,7 +108,7 @@ let args' else allPackages ( - (builtins.removeAttrs args' [ "selfBuild" ]) + (removeAttrs args' [ "selfBuild" ]) // { adjacentPackages = if args.selfBuild or true then diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 69ea14be5c83..f7780aacb892 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -16,7 +16,7 @@ let # Ignore custom stdenvs when cross compiling for compatibility # Use replaceCrossStdenv instead. - config = builtins.removeAttrs config [ "replaceStdenv" ]; + config = removeAttrs config [ "replaceStdenv" ]; }; in diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 6efe764947a8..c8f1bc66a06c 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -18,7 +18,7 @@ let overlays ; # Remove config.replaceStdenv to ensure termination. - config = builtins.removeAttrs config [ "replaceStdenv" ]; + config = removeAttrs config [ "replaceStdenv" ]; }; in diff --git a/pkgs/stdenv/darwin/bootstrap-tools.nix b/pkgs/stdenv/darwin/bootstrap-tools.nix index a3a9f17fb809..e14dfa3aea8e 100644 --- a/pkgs/stdenv/darwin/bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/bootstrap-tools.nix @@ -5,7 +5,7 @@ unpack, }: -builtins.derivation { +derivation { inherit (stdenv.hostPlatform) system; name = "bootstrap-tools"; @@ -17,7 +17,7 @@ builtins.derivation { ]; PATH = lib.makeBinPath [ - (builtins.placeholder "out") + (placeholder "out") unpack ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index d7f4145ed3b9..e28b3a0be1f5 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -594,8 +594,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check overrides = self: super: { inherit (prevStage) ccWrapperStdenv cctools ld64; - binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils"; - curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl"; + binutils-unwrapped = throw "nothing in the Darwin bootstrap should depend on GNU binutils"; + curl = throw "nothing in the Darwin bootstrap can depend on curl"; # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv. cmake = self.cmakeMinimal; diff --git a/pkgs/stdenv/darwin/test-bootstrap-tools.nix b/pkgs/stdenv/darwin/test-bootstrap-tools.nix index fc463a1b3e07..0773ed5acc57 100644 --- a/pkgs/stdenv/darwin/test-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/test-bootstrap-tools.nix @@ -6,7 +6,7 @@ hello, }: -builtins.derivation { +derivation { name = "test-bootstrap-tools"; inherit (stdenv.hostPlatform) system; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 26a59ffb84d0..30637de08277 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -59,7 +59,7 @@ let attrs // { inherit system; - name = attrs.name or (builtins.baseNameOf (builtins.elemAt attrs.paths 0)); + name = attrs.name or (baseNameOf (builtins.elemAt attrs.paths 0)); src = bootstrapArchive; builder = "${bootstrapArchive}/bin/bash"; # this script will prefer to link files instead of copying them. @@ -497,7 +497,7 @@ in bzip2 xz ; - binutils-unwrapped = builtins.removeAttrs bootstrapTools.binutils-unwrapped [ "src" ]; + binutils-unwrapped = removeAttrs bootstrapTools.binutils-unwrapped [ "src" ]; fetchurl = import ../../build-support/fetchurl { inherit lib; inherit (self) stdenvNoCC; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index d8f519b0f185..ba42a85dec46 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -308,7 +308,7 @@ let and is missing the following outputs: - ${concatStrings (builtins.map (output: " - ${output}\n") missingOutputs)} + ${concatStrings (map (output: " - ${output}\n") missingOutputs)} ''; handleEvalIssue = diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index bbd4c0a14f65..9ebedb728989 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -60,7 +60,7 @@ let :::{.note} This is used as the fundamental building block of most other functions in Nixpkgs for creating derivations. - Most arguments are also passed through to the underlying call of [`builtins.derivation`](https://nixos.org/manual/nix/stable/language/derivations). + Most arguments are also passed through to the underlying call of [`derivation`](https://nixos.org/manual/nix/stable/language/derivations). ::: */ mkDerivation = fnOrAttrs: makeDerivationExtensible (toFunction fnOrAttrs); @@ -115,8 +115,8 @@ let ${ args.name or "${pname}-${version}" } was overridden with `version` but not `src` at ${pos.file or ""}:${ - builtins.toString pos.line or "" - }:${builtins.toString pos.column or ""}. + toString pos.line or "" + }:${toString pos.column or ""}. This is most likely not what you want. In order to properly change the version of a package, override both the `version` and `src` attributes: @@ -130,7 +130,7 @@ let }) (To silence this warning, set `__intentionallyOverridingVersion = true` in your `overrideAttrs` call.) - '' (prev // (builtins.removeAttrs thisOverlay [ "__intentionallyOverridingVersion" ])) + '' (prev // (removeAttrs thisOverlay [ "__intentionallyOverridingVersion" ])) ); in makeDerivationExtensible (extends' (lib.toExtension f0) rattrs); @@ -866,7 +866,7 @@ let # for a fixed-output derivation, the corresponding inputDerivation should # *not* be fixed-output. To achieve this we simply delete the attributes that # would make it fixed-output. - deleteFixedOutputRelatedAttrs = lib.flip builtins.removeAttrs [ + deleteFixedOutputRelatedAttrs = lib.flip removeAttrs [ "outputHashAlgo" "outputHash" "outputHashMode" diff --git a/pkgs/stdenv/linux/test-bootstrap-tools.nix b/pkgs/stdenv/linux/test-bootstrap-tools.nix index ee4e3b0e6c4c..7caa2a680269 100644 --- a/pkgs/stdenv/linux/test-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/test-bootstrap-tools.nix @@ -7,7 +7,7 @@ hello, }: -builtins.derivation { +derivation { name = "test-bootstrap-tools"; inherit (stdenv.hostPlatform) system; # We cannot "cross test" builder = busybox; @@ -36,7 +36,7 @@ builtins.derivation { '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext # only basename - (builtins.baseNameOf binutils.dynamicLinker)}) + (baseNameOf binutils.dynamicLinker)}) libc_includes=${bootstrapTools}/include-glibc '' + lib.optionalString (stdenv.hostPlatform.libc == "musl") '' diff --git a/pkgs/test/auto-patchelf-hook/package.nix b/pkgs/test/auto-patchelf-hook/package.nix index 21d99e5d75b8..79bab058fc1b 100644 --- a/pkgs/test/auto-patchelf-hook/package.nix +++ b/pkgs/test/auto-patchelf-hook/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { readarray -td':' runpathArray < <(echo -n "$runpath") echo "[auto-patchelf-hook-test]: Check that the runpath has the right number of entries" - test "''${#runpathArray[@]}" -eq ${builtins.toString (builtins.length allDeps)} + test "''${#runpathArray[@]}" -eq ${toString (builtins.length allDeps)} echo "[auto-patchelf-hook-test]: Check that the runpath contains the expected runtime deps" '' @@ -89,7 +89,7 @@ stdenv.mkDerivation { lib.lists.imap0 ( i: path: let - iAsStr = builtins.toString i; + iAsStr = toString i; in '' echo "[auto-patchelf-hook-test]: Check that entry ${iAsStr} is ${path}" diff --git a/pkgs/test/make-hardcode-gsettings-patch/default.nix b/pkgs/test/make-hardcode-gsettings-patch/default.nix index db79d7a3af6b..2bf63f56aa46 100644 --- a/pkgs/test/make-hardcode-gsettings-patch/default.nix +++ b/pkgs/test/make-hardcode-gsettings-patch/default.nix @@ -38,7 +38,7 @@ let cp -r --no-preserve=all "${expected}" src-expected pushd src - for patch in ${lib.escapeShellArgs (builtins.map (p: "${p}") patches)}; do + for patch in ${lib.escapeShellArgs (map (p: "${p}") patches)}; do patch < "$patch" done patch < "${patch}" diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 9791f4c29969..7f16e83ad5ce 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -34,7 +34,7 @@ rec { nativeBuildInputs = [ texLive ] ++ attrs.nativeBuildInputs or [ ]; text = builtins.toFile "${name}.tex" text; } - // builtins.removeAttrs attrs [ + // removeAttrs attrs [ "nativeBuildInputs" "text" "texLive" diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix index ec09f788a360..7c7d36d397d0 100644 --- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix +++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix @@ -11,7 +11,7 @@ zsh, }: let - cleanArgs = lib.flip builtins.removeAttrs [ + cleanArgs = lib.flip removeAttrs [ "dependencies" "meta" ]; diff --git a/pkgs/tools/networking/maubot/plugins/default.nix b/pkgs/tools/networking/maubot/plugins/default.nix index e40154c989ca..6d2cfb522c72 100644 --- a/pkgs/tools/networking/maubot/plugins/default.nix +++ b/pkgs/tools/networking/maubot/plugins/default.nix @@ -25,7 +25,7 @@ let ... }: stdenvNoCC.mkDerivation ( - builtins.removeAttrs attrs [ "base_config" ] + removeAttrs attrs [ "base_config" ] // { pluginName = "${pname}-v${version}.mbp"; nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ diff --git a/pkgs/tools/networking/maubot/wrapper.nix b/pkgs/tools/networking/maubot/wrapper.nix index 8a85905f9c0a..db2823e17eaa 100644 --- a/pkgs/tools/networking/maubot/wrapper.nix +++ b/pkgs/tools/networking/maubot/wrapper.nix @@ -46,7 +46,7 @@ let # XXX: would patching maubot be better? See: # https://github.com/maubot/maubot/blob/75879cfb9370aade6fa0e84e1dde47222625139a/maubot/server.py#L106 server.override_resource_path = - if builtins.isNull (baseConfig.server.override_resource_path or null) then + if isNull (baseConfig.server.override_resource_path or null) then "${unwrapped}/${python3.sitePackages}/maubot/management/frontend/build" else baseConfig.server.override_resource_path; diff --git a/pkgs/tools/package-management/akku/akkuDerivation.nix b/pkgs/tools/package-management/akku/akkuDerivation.nix index eb79b353d437..59ede90eb1aa 100644 --- a/pkgs/tools/package-management/akku/akkuDerivation.nix +++ b/pkgs/tools/package-management/akku/akkuDerivation.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation ( // args.meta or { }; setupHook = ./setup-hook.sh; } - // builtins.removeAttrs args [ + // removeAttrs args [ "name" "buildInputs" "meta" diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix index 7174be0eaa98..882db169d2bf 100644 --- a/pkgs/tools/package-management/akku/default.nix +++ b/pkgs/tools/package-management/akku/default.nix @@ -30,9 +30,9 @@ lib.makeScope newScope (self: rec { src = fetchurl { inherit url sha256; }; - buildInputs = builtins.map (x: akkuself.${x}) dependencies; + buildInputs = map (x: akkuself.${x}) dependencies; r7rs = source == "snow-fort"; - nativeBuildInputs = builtins.map (x: akkuself.${x}) dev-dependencies; + nativeBuildInputs = map (x: akkuself.${x}) dev-dependencies; unpackPhase = "tar xf $src"; meta.homepage = homepage; diff --git a/pkgs/tools/package-management/lix/revert-toml11-bump.patch b/pkgs/tools/package-management/lix/revert-toml11-bump.patch index 97bb2d4ed0a8..7b37d7060c1c 100644 --- a/pkgs/tools/package-management/lix/revert-toml11-bump.patch +++ b/pkgs/tools/package-management/lix/revert-toml11-bump.patch @@ -16,7 +16,7 @@ index 1522213cb4..0000000000 -version aligns with the [TOML v1.0.0 specification’s -requirement](https://toml.io/en/v1.0.0#integer) to reject integer -literals that cannot be losslessly parsed. This means that code like --`builtins.fromTOML "v=0x8000000000000000"` will now produce an error +-`fromTOML "v=0x8000000000000000"` will now produce an error -rather than silently saturating the integer result. diff --git a/lix/libexpr/primops/fromTOML.cc b/lix/libexpr/primops/fromTOML.cc index 9d4b5e6abf..3e26773eac 100644 @@ -147,7 +147,7 @@ index 0c90e85edf..0000000000 -error: - … while calling the 'fromTOML' builtin - at /pwd/in.nix:1:1: -- 1| builtins.fromTOML ''attr = 9223372036854775808'' +- 1| fromTOML ''attr = 9223372036854775808'' - | ^ - 2| - @@ -166,7 +166,7 @@ index a287e18655..0000000000 -error: - … while calling the 'fromTOML' builtin - at /pwd/in.nix:1:1: -- 1| builtins.fromTOML ''attr = -9223372036854775809'' +- 1| fromTOML ''attr = -9223372036854775809'' - | ^ - 2| - diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index dc3c7f02700c..2f8ba6c56b42 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -192,9 +192,7 @@ let buildInputs = if enabledPlugins == null then - builtins.concatMap pluginBuildInputs ( - builtins.attrNames (builtins.removeAttrs plugins [ "xencpu" ]) - ) + builtins.concatMap pluginBuildInputs (builtins.attrNames (removeAttrs plugins [ "xencpu" ])) else builtins.concatMap pluginBuildInputs enabledPlugins; in diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index d9eb3f973dca..767ae8206452 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -20,7 +20,7 @@ let ]; defaultSupport = builtins.listToAttrs ( # apple can only build on darwin, and it can't build everything else, and vice versa - builtins.map (gpu: { + map (gpu: { name = gpu; value = (gpu == "apple" && stdenv.buildPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) @@ -33,7 +33,7 @@ in } # additional packages with only one specific GPU family support // builtins.listToAttrs ( - builtins.map (gpu: { + map (gpu: { name = gpu; value = (callPackage ./build-nvtop.nix { "${gpu}" = true; }); }) defaultGPUFamilies diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 5c8019cd8d9f..fe2e8ed03c51 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -250,7 +250,7 @@ rec { "man" "info" ] - ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) corePackages); + ++ (map (builtins.replaceStrings [ "-" ] [ "_" ]) corePackages); nativeBuildInputs = [ pkg-config @@ -493,7 +493,7 @@ rec { "man" "info" ] - ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) coreBigPackages) + ++ (map (builtins.replaceStrings [ "-" ] [ "_" ]) coreBigPackages) # some outputs of metapost, omegaware are for ptex/uptex ++ [ "ptex" diff --git a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix index 8401de273044..3176bebc368e 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix @@ -67,7 +67,7 @@ let tlOutputName = tlTypeToOut.${tlType}; }; all = lib.filter pkgFilter combined ++ lib.filter (pkg: pkg.tlType == "tlpkg") combined; - converted = builtins.map toSpecified all; + converted = map toSpecified all; in buildTeXEnv { __extraName = extraName; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 4748f2f608d6..ade00aa8a608 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -254,7 +254,7 @@ let }; toSpecifiedNV = p: rec { name = value.tlOutputName; - value = builtins.removeAttrs p [ "pkgs" ] // { + value = removeAttrs p [ "pkgs" ] // { outputSpecified = true; tlOutputName = tlTypeToOut.${p.tlType}; }; @@ -262,10 +262,10 @@ let toTLPkgSet = pname: drvs: let - set = lib.listToAttrs (builtins.map toSpecifiedNV drvs); + set = lib.listToAttrs (map toSpecifiedNV drvs); mainDrv = set.out or set.tex or set.tlpkg or set.texdoc or set.texsource; in - builtins.removeAttrs mainDrv [ "outputSpecified" ]; + removeAttrs mainDrv [ "outputSpecified" ]; toTLPkgSets = { pkgs, ... }: lib.mapAttrsToList toTLPkgSet (lib.groupBy (p: p.pname) pkgs); # export TeX packages as { pkgs = [ ... ]; } in the top attribute set diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9caf1068efe..3f430c4868d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8214,7 +8214,7 @@ with pkgs; py ]; # Avoid update.nix/tests conflicts with libxml2. - passthru = builtins.removeAttrs libxml2.passthru [ + passthru = removeAttrs libxml2.passthru [ "updateScript" "tests" ]; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index a9e58d9c4e3f..0c2910d76eb4 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -20,7 +20,7 @@ let mkMassRebuild = args: mkOption ( - builtins.removeAttrs args [ "feature" ] + removeAttrs args [ "feature" ] // { type = args.type or (types.uniq types.bool); default = args.default or false; diff --git a/pkgs/top-level/factor-packages.nix b/pkgs/top-level/factor-packages.nix index 5ddc4ad86599..1da43653ba35 100644 --- a/pkgs/top-level/factor-packages.nix +++ b/pkgs/top-level/factor-packages.nix @@ -37,7 +37,7 @@ let } // lib.optionalAttrs pkgs.config.allowAliases { - interpreter = builtins.throw "factorPackages now offers various wrapped factor runtimes (see documentation) and the buildFactorApplication helper."; + interpreter = throw "factorPackages now offers various wrapped factor runtimes (see documentation) and the buildFactorApplication helper."; }; extensible-self = lib.makeExtensible (lib.extends overrides inside); in diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index db79a1588a7c..851ab4282902 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -55,7 +55,7 @@ assert args ? localSystem -> !(args ? system); assert args ? system -> !(args ? localSystem); import ./. ( - builtins.removeAttrs args [ "system" ] + removeAttrs args [ "system" ] // { inherit config overlays localSystem; } diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9b7fd56d4091..2e3fe3d68310 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -116,7 +116,7 @@ lib.makeScope pkgs.newScope ( ... }@args: stdenv.mkDerivation ( - (builtins.removeAttrs args [ "name" ]) + (removeAttrs args [ "name" ]) // { pname = "php-${name}"; extensionName = extName; @@ -845,7 +845,7 @@ lib.makeScope pkgs.newScope ( # [ { name = ; value = ; } ... ] # # which we later use listToAttrs to make all attrs available by name. - namedExtensions = builtins.map (drv: { + namedExtensions = map (drv: { name = drv.name; value = mkExtension drv; }) extensionData; diff --git a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix index 1979006bf262..8f0157feb7d8 100644 --- a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix +++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -11,7 +11,7 @@ let inherit (lib.strings) escapeNixIdentifier; allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) ( - builtins.removeAttrs defaultPkgConfigPackages [ "recurseForDerivations" ] + removeAttrs defaultPkgConfigPackages [ "recurseForDerivations" ] ); # nix-build rejects attribute names with periods diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 6cb54b8d782e..7a32824a5f6a 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -645,7 +645,7 @@ let teams = [ lib.teams.haskell ]; }; constituents = accumulateDerivations ( - builtins.map (name: jobs.haskellPackages."${name}") (maintainedPkgNames pkgs.haskellPackages) + map (name: jobs.haskellPackages."${name}") (maintainedPkgNames pkgs.haskellPackages) ); }; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 6d3ad1174107..fe4566bb175e 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -141,7 +141,7 @@ let splicedPackagesWithXorg = splicedPackages - // builtins.removeAttrs splicedPackages.xorg [ + // removeAttrs splicedPackages.xorg [ "callPackage" "newScope" "overrideScope" @@ -150,7 +150,7 @@ let packagesWithXorg = pkgs - // builtins.removeAttrs pkgs.xorg [ + // removeAttrs pkgs.xorg [ "callPackage" "newScope" "overrideScope" diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 90e842703417..9fa556ff7e02 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -92,7 +92,7 @@ let # The following line guarantees that the output of this function # is a well-formed platform with no missing fields. It will be # uncommented in a separate PR, in case it breaks the build. - #(x: lib.trivial.pipe x [ (x: builtins.removeAttrs x [ "_type" ]) lib.systems.parse.mkSystem ]) + #(x: lib.trivial.pipe x [ (x: removeAttrs x [ "_type" ]) lib.systems.parse.mkSystem ]) ( parsed // {