archives/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-03-08 01:24:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

treewide: fix broken-string-escape

Browse source 
Lix is going to warn, and in the future, error on broken string escape.
After a flaker run, the following escape were flagged as broken, so this
commit fix them to make sure Lix is still able to build nixpkgs once the
patch deprecating the broken escapes land.
This commit is contained in:
Justin ! 2025-12-18 00:01:29 -05:00
parent 6ab9745ee4
commit 127761a032
No known key found for this signature in database
20 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/networking/llama-swap.nix
View file

@ -48,7 +48,7 @@ in
healthCheckTimeout = 60;
models = {
"some-model" = {
cmd = "$\{llama-server\} --port ''\${PORT} -m /var/lib/llama-cpp/models/some-model.gguf -ngl 0 --no-webui";
cmd = "''\${llama-server} --port ''\${PORT} -m /var/lib/llama-cpp/models/some-model.gguf -ngl 0 --no-webui";
aliases = [
"the-best"
];

4
nixos/modules/services/web-apps/baikal.nix
View file

@ -83,11 +83,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)(.*)$;

12
nixos/modules/services/web-apps/drupal.nix
View file

@ -439,7 +439,7 @@ in
index index.php;
'';
locations = {
"~ '\.php$|^/update.php'" = {
"~ '\\.php$|^/update\\.php'" = {
extraConfig = ''
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.services.phpfpm.pools."drupal-${hostName}".socket};
@ -470,7 +470,7 @@ in
access_log off;
'';
};
"~ \..*/.*\.php$" = {
"~ \\..*/.*\\.php$" = {
extraConfig = ''
return 403;
'';
@ -480,7 +480,7 @@ in
return 403;
'';
};
"~ ^/sites/[^/]+/files/.*\.php$" = {
"~ ^/sites/[^/]+/files/.*\\.php$" = {
extraConfig = ''
deny all;
'';
@ -500,13 +500,13 @@ in
rewrite ^ /index.php;
'';
};
"~ /vendor/.*\.php$" = {
"~ /vendor/.*\\.php$" = {
extraConfig = ''
deny all;
return 404;
'';
};
"~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$" = {
"~* \\.(js|css|png|jpg|jpeg|gif|ico|svg)$" = {
extraConfig = ''
try_files $uri @rewrite;
expires max;
@ -518,7 +518,7 @@ in
try_files $uri @rewrite;
'';
};
"~ ^(/[a-z\-]+)?/system/files/" = {
"~ ^(/[a-z\\-]+)?/system/files/" = {
extraConfig = ''
try_files $uri /index.php?$query_string;
'';

2
nixos/modules/services/web-apps/limesurvey.nix
View file

@ -511,7 +511,7 @@ in
tryFiles = "$uri /index.php?$args";
};
"~ \.php$".extraConfig = ''
"~ \\.php$".extraConfig = ''
fastcgi_pass unix:${config.services.phpfpm.pools."limesurvey".socket};
'';
"/tmp".root = "/var/lib/limesurvey";

2
nixos/modules/services/web-apps/part-db.nix
View file

@ -179,7 +179,7 @@ in
sendfile off;
'';
};
"~ \.php$" = {
"~ \\.php$" = {
extraConfig = ''
include ${config.services.nginx.package}/conf/fastcgi_params ;
fastcgi_param SCRIPT_FILENAME $request_filename;

2
nixos/modules/services/web-apps/tuliprox.nix
View file

@ -60,7 +60,7 @@ in
}
{
name = "not_low_resolution";
value = "NOT (Title ~ \"(?i).*\(360p|240p\).*\")";
value = "NOT (Title ~ \"(?i).*(360p|240p).*\")";
}
{
name = "all_channels";

2
nixos/tests/web-apps/netbox/default.nix
View file

@ -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}");
}

2
pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
View file

@ -26,7 +26,7 @@ ocamlPackages.buildDunePackage rec {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"([0-9]+\.[0-9]+\.[0-9]+)"
"([0-9]+\\.[0-9]+\\.[0-9]+)"
];
};

2
pkgs/by-name/be/beedii/package.nix
View file

@ -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 = {

2
pkgs/by-name/bl/bloaty/package.nix
View file

@ -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
'';

10
pkgs/by-name/bl/blst/package.nix
View file

@ -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

2
pkgs/by-name/dp/dput-ng/package.nix
View file

@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication {
# Essentially: all tags from 1.40 onwards start with `debian/`,
# then the version, and then an optional suffix (usually reserved for backports).
# We want to ignore the backport versions, and strip the `debian/` prefix.
extraArgs = [ "--version-regex=(?:debian\/)?(\d+(?:\.\d+)*)(?:[_\+].*)?" ];
extraArgs = [ "--version-regex=(?:debian/)?(\\d+(?:\\.\\d+)*)(?:[_+].*)?" ];
};
meta = {

2
pkgs/by-name/ed/edgetx/package.nix
View file

@ -133,7 +133,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

2
pkgs/by-name/fi/filebeat8/package.nix
View file

@ -31,7 +31,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 = {

2
pkgs/by-name/fs/fstar/package.nix
View file

@ -105,7 +105,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"v(\d{4}\.\d{2}\.\d{2})$"
"v(\\d{4}\\.\\d{2}\\.\\d{2})$"
];
};
z3 = fstarZ3;

2
pkgs/by-name/lm/lmath/package.nix
View file

@ -39,7 +39,7 @@ appimageTools.wrapType2 {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^r([0-9\.]*)"
"^r([0-9.]*)"
];
};

2
pkgs/by-name/re/rescript-language-server/package.nix
View file

@ -60,7 +60,7 @@ buildNpmPackage (finalAttrs: {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"([0-9]+\.[0-9]+\.[0-9]+)"
"([0-9]+\\.[0-9]+\\.[0-9]+)"
];
};

2
pkgs/by-name/ze/zed-editor/package.nix
View file

@ -318,7 +318,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)$)(.+)$"
# use github releases instead of git tags
# zed sometimes moves git tags, making them unreliable

2
pkgs/by-name/zi/zizmor/package.nix
View file

@ -42,7 +42,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 = {

2
pkgs/games/quake2/yquake2/default.nix
View file

@ -58,7 +58,7 @@ let
makeFlags = [
"WITH_OPENAL=${lib.boolToYesNo openalSupport}"
"WITH_SYSTEMWIDE=yes"
"WITH_SYSTEMDIR=$\{out}/share/games/quake2"
"WITH_SYSTEMDIR=\${out}/share/games/quake2"
];
nativeBuildInputs = [ copyDesktopItems ];