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

lib.gvariant: escape backslashes in strings

Browse source 
PR #1433
This commit is contained in:
Symphorien Gibol 2020-08-08 12:00:00 +00:00 committed by Robert Helgesson
parent d1f4d1514d
commit e1fbb74b41
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/lib/gvariant.nix
View file

@ -123,7 +123,7 @@ in rec {
mkString = v: mkString = v:
mkPrimitive type.string v // { mkPrimitive type.string v // {
__toString = self: "'${escape [ "'" ] self.value}'"; __toString = self: "'${escape [ "'" "\\" ] self.value}'";
}; };
mkObjectpath = v: mkObjectpath = v:

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

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