philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

treewide: Escape backslash in strings properly

Browse source 
"\." is apparently the same as "." wheras the correct one is "\\."
This commit is contained in:
Tuomas Tynkkynen 2017-09-14 01:03:39 +03:00
parent 62711f4265
commit 0c368ef02f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/misc/geoip-updater.nix
View file

@ -238,7 +238,7 @@ in
assertions = [
{ assertion = (builtins.filter
(x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases) == [];
(x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases) == [];
message = ''
services.geoip-updater.databases supports only .gz and .xz databases.
@ -246,7 +246,7 @@ in
${toString cfg.databases}
Offending element(s):
${toString (builtins.filter (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases)};
${toString (builtins.filter (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases)};
'';
}
];

2
pkgs/development/idris-modules/default.nix
View file

@ -26,7 +26,7 @@
};
files = builtins.filter (n: n != "default") (pkgs.lib.mapAttrsToList (name: type: let
m = builtins.match "(.*)\.nix" name;
m = builtins.match "(.*)\\.nix" name;
in if m == null then "default" else builtins.head m) (builtins.readDir ./.));
in (builtins.listToAttrs (map (name: {
inherit name;

2
pkgs/top-level/impure.nix
View file

@ -50,7 +50,7 @@ in
# it's a directory, so the set of overlays from the directory, ordered lexicographically
let content = readDir path; in
map (n: import (path + ("/" + n)))
(builtins.filter (n: builtins.match ".*\.nix" n != null || pathExists (path + ("/" + n + "/default.nix")))
(builtins.filter (n: builtins.match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix")))
(attrNames content))
else
# it's a file, so the result is the contents of the file itself