Merge pull request #164068 from cab404/master

os-release: preserve fields from being excessively quoted
NixOS · Mar 16, 2022 · 1e49b30 · 1e49b30
2 parents e543cbb + 0c68e23
commit 1e49b30
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
@@ -8,8 +8,12 @@ let
  concatStringsSep mapAttrsToList toLower
  literalExpression mkRenamedOptionModule mkDefault mkOption trivial types;
 
+ needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s;
+ escapeIfNeccessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"'';
  attrsToText = attrs:
- concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}="${toString v}"'') attrs);
+ concatStringsSep "\n" (
+ mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs
+ );
 
 in
 {