treewide: Escape backslash in strings properly

"\." is apparently the same as "." wheras the correct one is "\\."
NixOS · Sep 13, 2017 · 0c368ef · 0c368ef · bjornfor · Sep 14, 2017
1 parent 62711f4
commit 0c368ef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
@@ -238,15 +238,15 @@ 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.
 
           Current value:
           ${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)};
         '';
       }
     ];

diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
@@ -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;

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
@@ -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