Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

lib.gvariant: escape newlines in strings

Browse source 
See #2096
This commit is contained in:
Robert Helgesson 2021-08-11 23:30:00 +02:00
parent c049a09d1a
commit 604561ba9a
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/lib/gvariant.nix
View file

@ -122,8 +122,9 @@ in rec {
};
mkString = v:
mkPrimitive type.string v // {
__toString = self: "'${escape [ "'" "\\" ] self.value}'";
let sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s);
in mkPrimitive type.string v // {
__toString = self: "'${sanitize self.value}'";
};
mkObjectpath = v:

8
tests/lib/types/gvariant-merge.nix
View file

@ -26,7 +26,11 @@ in {
{ string = "foo"; }
{ string = "foo"; }
{ escapedString = "' \\"; }
{
escapedString = ''
'\
'';
}
{ tuple = mkTuple [ 1 [ "foo" ] ]; }
@ -47,7 +51,7 @@ in {
bool = true
emptyArray1 = @as []
emptyArray2 = @as []
escapedString = '\' \\'
escapedString = '\'\\\n'
float = 3.140000
int = 42
list = @as ['one','two']