summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpiegames <git@piegames.de>2025-12-29 16:07:45 +0000
committerGitHub <noreply@github.com>2025-12-29 16:07:45 +0000
commit1345d7a06f44a4d732527e2e1531adb6c67303fb (patch)
tree5ad34d3e1399b4e67e800678c84366539f6ef62a
parentb93bc3b00ae6364160aa76b00de4c5cc4d0fea4a (diff)
parent83b3d3dfe256984753dd7082a7d32ea234c7bd30 (diff)
[release-25.05] treewide: fix broken-string-escape (#474906)
-rw-r--r--nixos/modules/services/web-apps/baikal.nix4
-rw-r--r--nixos/modules/services/web-apps/part-db.nix2
-rw-r--r--nixos/tests/web-apps/netbox/default.nix2
-rw-r--r--pkgs/by-name/be/beedii/package.nix2
-rw-r--r--pkgs/by-name/bl/bloaty/package.nix2
-rw-r--r--pkgs/by-name/bl/blst/package.nix10
-rw-r--r--pkgs/by-name/ed/edgetx/package.nix4
-rw-r--r--pkgs/by-name/eq/equicord/package.nix2
-rw-r--r--pkgs/by-name/fi/filebeat8/package.nix2
-rw-r--r--pkgs/by-name/fs/fstar/package.nix2
-rw-r--r--pkgs/by-name/li/libcupsfilters/package.nix2
-rw-r--r--pkgs/by-name/lm/lmath/package.nix2
-rw-r--r--pkgs/by-name/ze/zed-editor/package.nix2
-rw-r--r--pkgs/by-name/zi/zizmor/package.nix2
-rw-r--r--pkgs/development/python-modules/ipydatawidgets/default.nix2
-rw-r--r--pkgs/games/quake2/yquake2/default.nix2
16 files changed, 22 insertions, 22 deletions
diff --git a/nixos/modules/services/web-apps/baikal.nix b/nixos/modules/services/web-apps/baikal.nix
index 91a007e6e541..ea2bda4e263d 100644
--- a/nixos/modules/services/web-apps/baikal.nix
+++ b/nixos/modules/services/web-apps/baikal.nix
@@ -98,11 +98,11 @@ in
rewrite ^/.well-known/caldav /dav.php redirect;
rewrite ^/.well-known/carddav /dav.php redirect;
'';
- "~ /(\.ht|Core|Specific|config)".extraConfig = ''
+ "~ /(\\.ht|Core|Specific|config)".extraConfig = ''
deny all;
return 404;
'';
- "~ ^(.+\.php)(.*)$".extraConfig = ''
+ "~ ^(.+\\.php)(.*)$".extraConfig = ''
try_files $fastcgi_script_name =404;
include ${config.services.nginx.package}/conf/fastcgi.conf;
fastcgi_split_path_info ^(.+\.php)(.*)$;
diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix
index 6c3beb77b06f..99fcfa442899 100644
--- a/nixos/modules/services/web-apps/part-db.nix
+++ b/nixos/modules/services/web-apps/part-db.nix
@@ -179,7 +179,7 @@ in
sendfile off;
'';
};
- "~ \.php$" = {
+ "~ \\.php$" = {
extraConfig = ''
include ${config.services.nginx.package}/conf/fastcgi_params ;
fastcgi_param SCRIPT_FILENAME $request_filename;
diff --git a/nixos/tests/web-apps/netbox/default.nix b/nixos/tests/web-apps/netbox/default.nix
index e9636b3c6eea..b614b965ae6d 100644
--- a/nixos/tests/web-apps/netbox/default.nix
+++ b/nixos/tests/web-apps/netbox/default.nix
@@ -157,7 +157,7 @@ import ../../make-test-python.nix (
'';
in
builtins.replaceStrings
- [ "$\{changePassword}" "$\{testUser}" "$\{testPassword}" "$\{testGroup}" ]
+ [ "\${changePassword}" "\${testUser}" "\${testPassword}" "\${testGroup}" ]
[ "${changePassword}" "${testUser}" "${testPassword}" "${testGroup}" ]
(lib.readFile "${./testScript.py}");
}
diff --git a/pkgs/by-name/be/beedii/package.nix b/pkgs/by-name/be/beedii/package.nix
index 621f7f206c7d..644e1981c54a 100644
--- a/pkgs/by-name/be/beedii/package.nix
+++ b/pkgs/by-name/be/beedii/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
# This version does not include font files in the released assets.
# https://github.com/webkul/beedii/issues/1
- ignoredVersions = "^1\.2\.0$";
+ ignoredVersions = "^1\\.2\\.0$";
};
meta = {
diff --git a/pkgs/by-name/bl/bloaty/package.nix b/pkgs/by-name/bl/bloaty/package.nix
index fab4550cbdb0..7f919c5d48d0 100644
--- a/pkgs/by-name/bl/bloaty/package.nix
+++ b/pkgs/by-name/bl/bloaty/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
substituteInPlace CMakeLists.txt \
--replace "find_package(Python COMPONENTS Interpreter)" "" \
--replace "if(Python_FOUND AND LIT_EXECUTABLE" "if(LIT_EXECUTABLE" \
- --replace "COMMAND \''\${Python_EXECUTABLE} \''\${LIT_EXECUTABLE}" "COMMAND \''\${LIT_EXECUTABLE}"
+ --replace "COMMAND \''${Python_EXECUTABLE} \''${LIT_EXECUTABLE}" "COMMAND \''${LIT_EXECUTABLE}"
# wasm test fail. Possibly due to LLVM version < 17. See https://github.com/google/bloaty/pull/354
rm -rf tests/wasm
'';
diff --git a/pkgs/by-name/bl/blst/package.nix b/pkgs/by-name/bl/blst/package.nix
index 34c66eeb0eb5..0f05eb592dec 100644
--- a/pkgs/by-name/bl/blst/package.nix
+++ b/pkgs/by-name/bl/blst/package.nix
@@ -44,17 +44,17 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $out/lib/pkgconfig
cat <<EOF > $out/lib/pkgconfig/libblst.pc
prefix=$out
- exec_prefix=''\\''${prefix}
- libdir=''\\''${exec_prefix}/lib
- includedir=''\\''${prefix}/include
+ exec_prefix=\''${prefix}
+ libdir=\''${exec_prefix}/lib
+ includedir=\''${prefix}/include
Name: libblst
Description: ${finalAttrs.meta.description}
URL: ${finalAttrs.meta.homepage}
Version: ${finalAttrs.version}
- Cflags: -I''\\''${includedir}
- Libs: -L''\\''${libdir} -lblst
+ Cflags: -I \''${includedir}
+ Libs: -L \''${libdir} -lblst
Libs.private:
EOF
diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 12f6516b0186..060b1c9fb61d 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
- cmakeCommonFlags="$''\{cmakeFlags[@]}"
+ cmakeCommonFlags="''${cmakeFlags[@]}"
# This is the most sensible way to convert target name -> cmake options
# aside from manually extracting bash variables from upstream's CI scripts
# and converting that to nix expressions. Let's hope upstream doesn't break
@@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
# Yes, this is really how upstream expects packaging to look like ¯\_(ツ)_/¯.
# https://github.com/EdgeTX/edgetx/wiki/Build-Instructions-under-Ubuntu-20.04#building-companion-simulator-and-radio-simulator-libraries
- for plugin in "$''\{targetsToBuild[@]''\}"
+ for plugin in "''${targetsToBuild[@]}"
do
# Variable modified by `get_target_build_options` from build-common.sh.
local BUILD_OPTIONS=""
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 595c9b8f10cf..c5a0298361bf 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
- "^\d{4}-\d{2}-\d{2}$"
+ "^(\\d{4}-\\d{2}-\\d{2})$"
];
};
diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index c174fac4ee0c..d910eed767f6 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
doInstallCheck = true;
passthru = {
- updateScript = nix-update-script { extraArgs = [ "--version-regex=v(8\..*)" ]; };
+ updateScript = nix-update-script { extraArgs = [ "--version-regex=v(8\\..*)" ]; };
};
meta = {
diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix
index ffb82e70ed20..080207cf4aa3 100644
--- a/pkgs/by-name/fs/fstar/package.nix
+++ b/pkgs/by-name/fs/fstar/package.nix
@@ -107,7 +107,7 @@ ocamlPackages.buildDunePackage rec {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
- "v(\d{4}\.\d{2}\.\d{2})$"
+ "v(\\d{4}\\.\\d{2}\\.\\d{2})$"
];
};
z3 = fstarZ3;
diff --git a/pkgs/by-name/li/libcupsfilters/package.nix b/pkgs/by-name/li/libcupsfilters/package.nix
index 8630c5fc3d72..05e8fae55327 100644
--- a/pkgs/by-name/li/libcupsfilters/package.nix
+++ b/pkgs/by-name/li/libcupsfilters/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
name = "CVE-2025-64503.patch";
url = "https://github.com/OpenPrinting/libcupsfilters/commit/fd01543f372ca3ba1f1c27bd3427110fa0094e3f.patch";
# File has been renamed before the fix
- decode = "sed -e 's/pdftoraster\.c/pdftoraster\.cxx/g'";
+ decode = "sed -e 's/pdftoraster\\.c/pdftoraster\\.cxx/g'";
hash = "sha256-cKbDHZEc/A51M+ce3kVsRxjRUWA96ynGv/avpq4iUHU=";
})
(fetchpatch {
diff --git a/pkgs/by-name/lm/lmath/package.nix b/pkgs/by-name/lm/lmath/package.nix
index 9b29d50f552d..7f83bde3eed8 100644
--- a/pkgs/by-name/lm/lmath/package.nix
+++ b/pkgs/by-name/lm/lmath/package.nix
@@ -39,7 +39,7 @@ appimageTools.wrapType2 {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
- "^r([0-9\.]*)"
+ "^r([0-9\\.]*)"
];
};
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 239d323376e7..81e6a709c6a4 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -312,7 +312,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
- "^v(?!.*(?:-pre|0\.999999\.0|0\.9999-temporary)$)(.+)$"
+ "^v(?!.*(?:-pre|0\\.999999\\.0|0\\.9999-temporary)$)(.+)$"
];
};
fhs = fhs { zed-editor = finalAttrs.finalPackage; };
diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index 592fac723dcd..c78b0e142921 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
doInstallCheck = true;
passthru.updateScript = nix-update-script {
- extraArgs = [ "--version-regex=^v([0-9.]+\.[0-9.]+\.[0-9.])+$" ];
+ extraArgs = [ "--version-regex=^v([0-9.]+\\.[0-9.]+\\.[0-9.])+$" ];
};
meta = {
diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix
index bf3ff8800aab..5d6e348ffad6 100644
--- a/pkgs/development/python-modules/ipydatawidgets/default.nix
+++ b/pkgs/development/python-modules/ipydatawidgets/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
"--deselect=ipydatawidgets/tests/test_ndarray_trait.py::test_dtype_coerce"
# https://github.com/vidartf/ipydatawidgets/issues/63
- "--deselect=examples/test.ipynb::Cell\\\ 3"
+ "--deselect=examples/test.ipynb::Cell\\ 3"
];
meta = {
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 31e2b7ee9d65..25743d5cee15 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -60,7 +60,7 @@ let
makeFlags = [
"WITH_OPENAL=${mkFlag openalSupport}"
"WITH_SYSTEMWIDE=yes"
- "WITH_SYSTEMDIR=$\{out}/share/games/quake2"
+ "WITH_SYSTEMDIR=\${out}/share/games/quake2"
];
nativeBuildInputs = [ copyDesktopItems ];