Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: String escape fixes #365186

Merged
merged 16 commits into from
Dec 15, 2024
Merged

treewide: String escape fixes #365186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
772ad02
klee: Fix invalid string escape
piegamesde Dec 14, 2024
ac27331
mlton: Fix invalid string escape
piegamesde Dec 14, 2024
69f9bc3
renode-unstable: Fix invalid string escape
piegamesde Dec 14, 2024
62fcc79
awscli2: Fix invalid string escape
piegamesde Dec 14, 2024
50a57d5
circt: Fix invalid string escape
piegamesde Dec 14, 2024
8b344a7
mattermost: Fix invalid string escape
piegamesde Dec 14, 2024
dfc3657
paperjam: Fix invalid string escape
piegamesde Dec 14, 2024
0bf6262
turbo-unwrapped: Fix invalid string escape
piegamesde Dec 14, 2024
f969847
teams: Fix invalid string escape
piegamesde Dec 14, 2024
70e7ca4
uuu: Fix invalid string escape
piegamesde Dec 14, 2024
bd29629
av1an-unwrapped: Fix invalid string escape
piegamesde Dec 14, 2024
6d81529
duplicity: Fix invalid string escape
piegamesde Dec 14, 2024
e044fed
pkcs11-provider: Fix invalid string escape
piegamesde Dec 14, 2024
160f865
vscode-js-debug: Fix invalid string escape
piegamesde Dec 14, 2024
515a6a3
treewide: Fix wrong string indentations
piegamesde Dec 14, 2024
591861f
treewide: Fix invalid string escapes
piegamesde Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/science/logic/klee/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ llvmPackages.stdenv.mkDerivation rec {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"v(\d\.\d)"
"v(\\d\\.\\d)"
];
};
# Let the user access the chosen uClibc outside the derivation.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/science/logic/klee/klee-uclibc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ llvmPackages.stdenv.mkDerivation rec {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"v(\d\.\d)"
"v(\\d\\.\\d)"
];
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/build-support/trivial-builders/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ rec {
(name: value:
{
inherit value;
name = lib.head (builtins.match "${builtins.storeDir}/[${nixHashChars}]+-(.*)\.drv" name);
name = lib.head (builtins.match "${builtins.storeDir}/[${nixHashChars}]+-(.*)\\.drv" name);
})
derivations;
# The syntax of output paths differs between outputs named `out`
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/av/av1an-unwrapped/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"'^(\d*\.\d*\.\d*)$'"
"'^(\\d*\\.\\d*\\.\\d*)$'"
];
};
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/aw/awscli2/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ py.pkgs.buildPythonApplication rec {
# Excludes 1.x versions from the Github tags list
extraArgs = [
"--version-regex"
"^(2\.(.*))"
"^(2\\.(.*))"
];
};
tests.version = testers.testVersion {
Expand Down
14 changes: 7 additions & 7 deletions pkgs/by-name/ci/circt/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue.
#
# As a temporary fix, we disabled these tests when using clang stdenv
lib.optionals stdenv.cc.isClang [ "CIRCT :: Target/ExportSystemC/.*\.mlir" ]
lib.optionals stdenv.cc.isClang [ "CIRCT :: Target/ExportSystemC/.*\\.mlir" ]
# Disable some tests on x86_64-darwin
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
# These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines
"CIRCT :: Target/ExportSMTLIB/.*\.mlir"
"CIRCT :: circt-bmc/.*\.mlir"
"CIRCT :: Target/ExportSMTLIB/.*\\.mlir"
"CIRCT :: circt-bmc/.*\\.mlir"
# These tests were having issues on rosetta
"CIRCT :: Dialect/.*/Reduction/.*\.mlir"
"CIRCT :: Dialect/SMT/.*\.mlir"
"CIRCT :: circt-as-dis/.*\.mlir"
"CIRCT :: circt-reduce/.*\.mlir"
"CIRCT :: Dialect/.*/Reduction/.*\\.mlir"
"CIRCT :: Dialect/SMT/.*\\.mlir"
"CIRCT :: circt-as-dis/.*\\.mlir"
"CIRCT :: circt-reduce/.*\\.mlir"
"CIRCT :: circt-test/basic.mlir"
];
in
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/du/duplicity/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ let
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"rel\.(.*)"
"rel\\.(.*)"
];
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/ma/mattermost/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ buildGoModule rec {

passthru = {
updateScript = nix-update-script {
extraArgs = [ "--version-regex" "^v(9\.11\.[0-9]+)$" ];
extraArgs = [ "--version-regex" "^v(9\\.11\\.[0-9]+)$" ];
};
tests.mattermost = nixosTests.mattermost;
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/pa/paperjam/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [
"PREFIX=$(out)"
# prevent real build date which is impure
"BUILD_DATE=\<unknown\>"
"BUILD_COMMIT=\<unknown\>"
"BUILD_DATE=\\<unknown\\>"
"BUILD_COMMIT=\\<unknown\\>"
];

# provide backward compatible PointerHolder, suppress deprecation warnings
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/pk/pkcs11-provider/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"v(\d\.\d)"
"v(\\d\\.\\d)"
];
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/re/renode-unstable/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ renode.overrideAttrs (

passthru.updateScript =
let
versionRegex = "[0-9\.\+]+[^\+]*.";
versionRegex = "[0-9\\.\\+]+[^\\+]*.";
in
writeScript "${finalAttrs.pname}-updater" ''
#!/usr/bin/env nix-shell
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/te/teams/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ stdenv.mkDerivation {
zcat < Teams_osx_app.pkg/Payload | cpio -i
'';

sourceRoot = "Microsoft\ Teams.app";
sourceRoot = "Microsoft\\ Teams.app";
dontPatch = true;
dontConfigure = true;
dontBuild = true;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/tu/turbo-unwrapped/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"'v(\d+\.\d+\.\d+)'"
"'v(\\d+\\.\\d+\\.\\d+)'"
];
};
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/uu/uuu/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"uuu_\([0-9.]+\)"
"uuu_\\([0-9.]+\\)"
];
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/vs/vscode-js-debug/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ buildNpmPackage rec {
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"v((?!\d{4}\.\d\.\d{3}).*)"
"v((?!\\d{4}\\.\\d\\.\\d{3}).*)"
];
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/mlton/20210117-binary.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
(fetchpatch {
name = "remove-duplicate-if.patch";
url = "https://github.com/MLton/mlton/commit/22002cd0a53a1ab84491d74cb8dc6a4e50c1f7b7.patch";
decode = "sed -e 's|Makefile\.binary|Makefile|g'";
decode = "sed -e 's|Makefile\\.binary|Makefile|g'";
hash = "sha256-Gtmc+OIh+m7ordSn74fpOKVDQDtYyLHe6Le2snNCBYQ=";
})
];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/pkgs-lib/formats/hocon/test/comprehensive/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ let
"b"
]
];
nasty_string = "\"@\n\\\t^*\b\f\n\0\";'''$";
nasty_string = "\"@\n\\\t^*bf\n0\";'''$";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nasty indeed.

Copy link
Member Author

@piegamesde piegamesde Dec 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is especially hilarious because if you look at the expected output, it "correctly" contains b, f and 0. Which means that nobody bothered actually checking it?

I think it would be more interesting if that string actually contained the characters it intended to contain (except the NUL byte, because that horribly breaks Nix …), but I couldn't figure out how to easily put a line feed into a string without actually putting verbatim into the file, so …


"misc attrs" = {
x = 1;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/pkgs-lib/formats/java-properties/test/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ stdenv.mkDerivation {
);

src = lib.sourceByRegex ./. [
".*\.java"
".*\\.java"
];
# On Linux, this can be C.UTF-8, but darwin + zulu requires en_US.UTF-8
LANG = "en_US.UTF-8";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ let
1
])
];
nasty_string = "\"@\n\\\t^*\b\f\n\0\";'''$";
nasty_string = "\"@\n\\\t^*bf\n0\";'''$";

weirderTypes = {
_includes = [ include_file ];
Expand Down
3 changes: 2 additions & 1 deletion pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,8 @@ mapAliases {
nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25
nagiosPluginsOfficial = monitoring-plugins;
neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
nerdfonts = throw ''nerdfonts has been separated into individual font packages under the namespace nerd-fonts.
nerdfonts = throw ''
nerdfonts has been separated into individual font packages under the namespace nerd-fonts.
For example change:
fonts.packages = [
...
Expand Down
Loading