Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #68946 from volth/escape

treewide: fix string escapes

authored by Jörg Thalheim and committed by GitHub bfed455d 8025787c

+27 -27
+2 -2
nixos/modules/programs/less.nix
··· 54 type = types.attrsOf types.str; 55 default = {}; 56 example = { 57 - h = "noaction 5\e("; 58 - l = "noaction 5\e)"; 59 }; 60 description = "Defines new command keys."; 61 };
··· 54 type = types.attrsOf types.str; 55 default = {}; 56 example = { 57 + h = "noaction 5\\e("; 58 + l = "noaction 5\\e)"; 59 }; 60 description = "Defines new command keys."; 61 };
+1 -1
nixos/modules/services/mail/rspamd.nix
··· 68 replaced with <literal>rspamd_proxy</literal>. 69 ''; 70 apply = let 71 - from = "services.rspamd.workers.\”${name}\".type"; 72 files = options.type.files; 73 warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`"; 74 in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x;
··· 68 replaced with <literal>rspamd_proxy</literal>. 69 ''; 70 apply = let 71 + from = "services.rspamd.workers.\"${name}\".type"; 72 files = options.type.files; 73 warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`"; 74 in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x;
+1 -1
nixos/modules/services/monitoring/graphite.nix
··· 239 description = "Any metrics received which match one of the experssions will be dropped."; 240 default = null; 241 type = types.nullOr types.str; 242 - example = "^some\.noisy\.metric\.prefix\..*"; 243 }; 244 245 whitelist = mkOption {
··· 239 description = "Any metrics received which match one of the experssions will be dropped."; 240 default = null; 241 type = types.nullOr types.str; 242 + example = "^some\\.noisy\\.metric\\.prefix\\..*"; 243 }; 244 245 whitelist = mkOption {
+1 -1
nixos/modules/services/networking/prosody.nix
··· 465 466 modules_enabled = { 467 468 - ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList 469 (name: val: optionalString val "${toLua name};") 470 cfg.modules) } 471 ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
··· 465 466 modules_enabled = { 467 468 + ${ lib.concatStringsSep "\n " (lib.mapAttrsToList 469 (name: val: optionalString val "${toLua name};") 470 cfg.modules) } 471 ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
+5 -5
nixos/modules/services/web-apps/matomo.nix
··· 105 default = null; 106 example = { 107 serverAliases = [ 108 - "matomo.$\{config.networking.domain\}" 109 - "stats.$\{config.networking.domain\}" 110 ]; 111 enableACME = false; 112 }; ··· 115 Either this option or the webServerUser option is mandatory. 116 Set this to {} to just enable the virtualHost if you don't need any customization. 117 If enabled, then by default, the <option>serverName</option> is 118 - <literal>${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}</literal>, 119 SSL is active, and certificates are acquired via ACME. 120 If this is set to null (the default), no nginx virtualHost will be configured. 121 ''; ··· 275 fastcgi_pass unix:${phpSocket}; 276 ''; 277 # Any other attempt to access any php files is forbidden 278 - locations."~* ^.+\.php$".extraConfig = '' 279 return 403; 280 ''; 281 # Disallow access to unneeded directories ··· 284 return 403; 285 ''; 286 # Disallow access to several helper files 287 - locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' 288 return 403; 289 ''; 290 # No crawling of this site for bots that obey robots.txt - no useful information here.
··· 105 default = null; 106 example = { 107 serverAliases = [ 108 + "matomo.\${config.networking.domain}" 109 + "stats.\${config.networking.domain}" 110 ]; 111 enableACME = false; 112 }; ··· 115 Either this option or the webServerUser option is mandatory. 116 Set this to {} to just enable the virtualHost if you don't need any customization. 117 If enabled, then by default, the <option>serverName</option> is 118 + <literal>''${user}.''${config.networking.hostName}.''${config.networking.domain}</literal>, 119 SSL is active, and certificates are acquired via ACME. 120 If this is set to null (the default), no nginx virtualHost will be configured. 121 ''; ··· 275 fastcgi_pass unix:${phpSocket}; 276 ''; 277 # Any other attempt to access any php files is forbidden 278 + locations."~* ^.+\\.php$".extraConfig = '' 279 return 403; 280 ''; 281 # Disallow access to unneeded directories ··· 284 return 403; 285 ''; 286 # Disallow access to several helper files 287 + locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' 288 return 403; 289 ''; 290 # No crawling of this site for bots that obey robots.txt - no useful information here.
+2 -2
nixos/modules/services/web-apps/restya-board.nix
··· 235 236 locations."/".root = "${runDir}/client"; 237 238 - locations."~ \.php$" = { 239 tryFiles = "$uri =404"; 240 extraConfig = '' 241 include ${pkgs.nginx}/conf/fastcgi_params; ··· 246 ''; 247 }; 248 249 - locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { 250 root = "${runDir}/client"; 251 extraConfig = '' 252 if (-f $request_filename) {
··· 235 236 locations."/".root = "${runDir}/client"; 237 238 + locations."~ \\.php$" = { 239 tryFiles = "$uri =404"; 240 extraConfig = '' 241 include ${pkgs.nginx}/conf/fastcgi_params; ··· 246 ''; 247 }; 248 249 + locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = { 250 root = "${runDir}/client"; 251 extraConfig = '' 252 if (-f $request_filename) {
+1 -1
nixos/modules/services/web-apps/tt-rss.nix
··· 548 index = "index.php"; 549 }; 550 551 - locations."~ \.php$" = { 552 extraConfig = '' 553 fastcgi_split_path_info ^(.+\.php)(/.+)$; 554 fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
··· 548 index = "index.php"; 549 }; 550 551 + locations."~ \\.php$" = { 552 extraConfig = '' 553 fastcgi_split_path_info ^(.+\.php)(/.+)$; 554 fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
+1 -1
pkgs/applications/video/kino/default.nix
··· 80 81 postInstall = " 82 rpath=`patchelf --print-rpath \$out/bin/kino`; 83 - for i in $\buildInputs; do 84 echo adding \$i/lib 85 rpath=\$rpath\${rpath:+:}\$i/lib 86 done
··· 80 81 postInstall = " 82 rpath=`patchelf --print-rpath \$out/bin/kino`; 83 + for i in $buildInputs; do 84 echo adding \$i/lib 85 rpath=\$rpath\${rpath:+:}\$i/lib 86 done
+2 -2
pkgs/development/haskell-modules/hackage-packages.nix
··· 57676 version = "0.1.0.1"; 57677 sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha"; 57678 libraryHaskellDepends = [ base ]; 57679 - description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`."; 57680 license = stdenv.lib.licenses.bsd3; 57681 }) {}; 57682 ··· 253088 base containers exceptions free spiros split text transformers 253089 ]; 253090 executableHaskellDepends = [ base ]; 253091 - description = "Automate keyboard\/mouse\/clipboard\/application interaction"; 253092 license = stdenv.lib.licenses.bsd3; 253093 hydraPlatforms = stdenv.lib.platforms.none; 253094 broken = true;
··· 57676 version = "0.1.0.1"; 57677 sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha"; 57678 libraryHaskellDepends = [ base ]; 57679 + description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`."; 57680 license = stdenv.lib.licenses.bsd3; 57681 }) {}; 57682 ··· 253088 base containers exceptions free spiros split text transformers 253089 ]; 253090 executableHaskellDepends = [ base ]; 253091 + description = "Automate keyboard/mouse/clipboard/application interaction"; 253092 license = stdenv.lib.licenses.bsd3; 253093 hydraPlatforms = stdenv.lib.platforms.none; 253094 broken = true;
+7 -7
pkgs/development/tools/misc/ctags/wrapped.nix
··· 27 28 # don't scan version control directories 29 defaultArgs = [ 30 - "--exclude=\.svn" 31 - "--exclude=\.hg" 32 - "--exclude=\.git" 33 - "--exclude=\_darcs" 34 "--sort=yes" 35 ]; 36 ··· 38 asLang = [ 39 "--langdef=ActionScript" 40 "--langmap=ActionScript:.as" 41 - "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/" 42 - "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/" 43 "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/" 44 "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" 45 "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" ··· 67 nixLang = [ 68 "--langdef=NIX" 69 "--langmap=NIX:.nix" 70 - "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/" 71 ]; 72 73 rubyLang = [
··· 27 28 # don't scan version control directories 29 defaultArgs = [ 30 + "--exclude=.svn" 31 + "--exclude=.hg" 32 + "--exclude=.git" 33 + "--exclude=_darcs" 34 "--sort=yes" 35 ]; 36 ··· 38 asLang = [ 39 "--langdef=ActionScript" 40 "--langmap=ActionScript:.as" 41 + "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/" 42 + "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/" 43 "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/" 44 "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" 45 "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" ··· 67 nixLang = [ 68 "--langdef=NIX" 69 "--langmap=NIX:.nix" 70 + "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/" 71 ]; 72 73 rubyLang = [
+2 -2
pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
··· 14 # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; 15 NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" 16 "-DDAEMON_GID=1" 17 - "-DDEFAULT_AT_QUEUE=\'a\'" 18 - "-DDEFAULT_BATCH_QUEUE=\'b\'" 19 "-DPERM_PATH=\"/usr/lib/cron/\"" 20 "-DOPEN_DIRECTORY" 21 "-DNO_DIRECT_RPC"
··· 14 # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; 15 NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" 16 "-DDAEMON_GID=1" 17 + "-DDEFAULT_AT_QUEUE='a'" 18 + "-DDEFAULT_BATCH_QUEUE='b'" 19 "-DPERM_PATH=\"/usr/lib/cron/\"" 20 "-DOPEN_DIRECTORY" 21 "-DNO_DIRECT_RPC"
+2 -2
pkgs/tools/typesetting/tex/texlive/combine.nix
··· 136 script = 137 writeText "hyphens.sed" ( 138 # pick up the header 139 - "1,/^\% from/p;" 140 # pick up all sections matching packages that we combine 141 - + lib.concatMapStrings (pname: "/^\% from ${pname}:$/,/^\%/p;\n") pnames 142 ); 143 in '' 144 (
··· 136 script = 137 writeText "hyphens.sed" ( 138 # pick up the header 139 + "1,/^% from/p;" 140 # pick up all sections matching packages that we combine 141 + + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames 142 ); 143 in '' 144 (