nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

lib: support gvariant maybe type

Browse source 
Fixes #1397
This commit is contained in:
Robert Helgesson 2020-07-24 16:31:56 +02:00
parent 8ad5580021
commit 83301ca787
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
4 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/lib/gvariant.nix
View file

@ -18,6 +18,7 @@ let
type = {
arrayOf = t: "a${t}";
maybeOf = t: "m${t}";
tupleOf = ts: "(${concatStrings ts})";
string = "s";
boolean = "b";
@ -57,11 +58,21 @@ let
else
"";
mkMaybe = elemType: elem:
mkPrimitive (type.maybeOf elemType) elem // {
__toString = self:
if self.value == null then
"@${self.type} nothing"
else
"just ${toString self.value}";
};
in rec {
inherit type typeOf;
isArray = hasPrefix "a";
isMaybe = hasPrefix "m";
isTuple = hasPrefix "(";
# Returns the GVariant value that most closely matches the given Nix
@ -92,6 +103,10 @@ in rec {
mkEmptyArray = elemType: mkArray elemType [ ];
mkNothing = elemType: mkMaybe elemType null;
mkJust = elem: let gvarElem = mkValue elem; in mkMaybe gvarElem.type gvarElem;
mkTuple = elems:
let
gvarElems = map mkValue elems;

2
modules/lib/types.nix
View file

@ -77,6 +77,8 @@ in rec {
(map (d: d // { value = d.value.value; }) vdefs)
else if gvar.isTuple sharedDefType && allChecked then
mergeOneOption loc defs
else if gvar.isMaybe sharedDefType && allChecked then
mergeOneOption loc defs
else if gvar.type.string == sharedDefType && allChecked then
types.str.merge loc defs
else if gvar.type.double == sharedDefType && allChecked then