diff options
| author | NAHO <90870942+trueNAHO@users.noreply.github.com> | 2025-09-30 08:49:04 +0200 |
|---|---|---|
| committer | NAHO <90870942+trueNAHO@users.noreply.github.com> | 2025-10-04 19:02:37 +0200 |
| commit | c8d4dabc4357a22d1c249a9363998bdb00122544 (patch) | |
| tree | 02e67012814e5f3cf481c42a393a3364bad39f57 /pkgs/build-support/fetchpatch | |
| parent | nixos/syncthing: add guiPasswordFile option, add and move Syncthing tests (#4... (diff) | |
| download | nixpkgs-c8d4dabc4357a22d1c249a9363998bdb00122544.tar.gz | |
pkgs: remove optional builtins prefixes from prelude functions
Remove optional builtins prefixes from prelude functions by running:
builtins=(
abort
baseNameOf
break
derivation
derivationStrict
dirOf
false
fetchGit
fetchMercurial
fetchTarball
fetchTree
fromTOML
import
isNull
map
null
placeholder
removeAttrs
scopedImport
throw
toString
true
)
fd \
--type file \
. \
pkgs \
--exec-batch sed --in-place --regexp-extended "
s/\<builtins\.($(
printf '%s\n' "${builtins[@]}" |
paste --delimiter '|' --serial -
))\>/\1/g
"
nix fmt
Diffstat (limited to 'pkgs/build-support/fetchpatch')
| -rw-r--r-- | pkgs/build-support/fetchpatch/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
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" |
