movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: prefer replaceString over replaceStrings

Browse source
This commit is contained in:
Gutyina Gergő 2025-05-27 22:26:16 +02:00
parent b5720e2b3f
commit b3b0fd266b
No known key found for this signature in database
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/gvariant.nix
View file

@ -18,7 +18,7 @@ let
concatStrings
escape
head
replaceStrings
replaceString
;
mkPrimitive = t: v: {
@ -451,7 +451,7 @@ rec {
mkString =
v:
let
sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s);
sanitize = s: replaceString "\n" "\\n" (escape [ "'" "\\" ] s);
in
mkPrimitive type.string v
// {

2
lib/strings.nix
View file

@ -1173,7 +1173,7 @@ rec {
string = toString arg;
in
if match "[[:alnum:],._+:@%/-]+" string == null then
"'${replaceStrings [ "'" ] [ "'\\''" ] string}'"
"'${replaceString "'" "'\\''" string}'"
else
string;

4
lib/systems/default.nix
View file

@ -14,7 +14,7 @@ let
optionalAttrs
optionalString
removeSuffix
replaceStrings
replaceString
toUpper
;
@ -522,7 +522,7 @@ let
#
# https://github.com/rust-lang/cargo/pull/9169
# https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431
cargoEnvVarTarget = replaceStrings [ "-" ] [ "_" ] (toUpper final.rust.cargoShortTarget);
cargoEnvVarTarget = replaceString "-" "_" (toUpper final.rust.cargoShortTarget);
# True if the target is no_std
# https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421