From 5e4fca4c0d16ad6dbd959db17fb6f0aa718f79f1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 3 Sep 2021 21:26:39 +0200 Subject: [PATCH] Update kassandra --- home-manager/roles/kassandra/types.dhall | 951 +++++++++++++++-------- nix/sources.json | 2 +- private | 2 +- 3 files changed, 626 insertions(+), 329 deletions(-) diff --git a/home-manager/roles/kassandra/types.dhall b/home-manager/roles/kassandra/types.dhall index 04dab3ed..1affa0c3 100644 --- a/home-manager/roles/kassandra/types.dhall +++ b/home-manager/roles/kassandra/types.dhall @@ -42,72 +42,126 @@ StandaloneAccount = < RemoteAccount : { viewList : List < SearchWidget - | ConfigListWidget : { name : Text, limit : Optional Natural } + | DefinitionElementWidget : + { name : Text + , definitionElement : + < ConfigList : + { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : + { task : < HabiticaDaily | HabiticaTodo > + } + | Mail : { id : Text } + > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : + { list : < HabiticaDailys | HabiticaTodos > } + | Mails + > + } > , configuredLists : List { name : Text , list : - < QueryList : - { query : - List - < HasProperty : - { property : - < DescriptionMatches : { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > - } - | HasntProperty : - { property : - < DescriptionMatches : { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > - } + List + < ConfigList : { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : + { task : < HabiticaDaily | HabiticaTodo > } + | Mail : { id : Text } > - } - | TagList : { name : Text } - | DefinitionList : - { elements : - List - < ConfigList : - { name : Text, limit : Optional Natural } - | ListElement : - { item : - < TaskwarriorTask : { uuid : Text } - | AdHocTask : { description : Text } - | HabiticaTask : - { task : - < HabiticaDaily | HabiticaTodo > - } - | Mail : { id : Text } - > - } - > - } - | ChildrenList : { uuid : Text } - | DependenciesList : { uuid : Text } - | HabiticaList : - { list : < HabiticaDailys | HabiticaTodos > } - | Mails - > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : + { list : < HabiticaDailys | HabiticaTodos > } + | Mails + > } , uiFeatures : { sortInTag : Bool @@ -152,81 +206,131 @@ BackendConfig = { users : { viewList : List < SearchWidget - | ConfigListWidget : - { name : Text, limit : Optional Natural } + | DefinitionElementWidget : + { name : Text + , definitionElement : + < ConfigList : + { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : + { task : + < HabiticaDaily | HabiticaTodo > + } + | Mail : { id : Text } + > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : + { list : < HabiticaDailys | HabiticaTodos > + } + | Mails + > + } > , configuredLists : List { name : Text , list : - < QueryList : - { query : - List - < HasProperty : - { property : - < DescriptionMatches : - { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > - } - | HasntProperty : - { property : - < DescriptionMatches : - { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > + List + < ConfigList : + { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : + { task : + < HabiticaDaily | HabiticaTodo > } + | Mail : { id : Text } > - } - | TagList : { name : Text } - | DefinitionList : - { elements : - List - < ConfigList : - { name : Text - , limit : Optional Natural - } - | ListElement : - { item : - < TaskwarriorTask : - { uuid : Text } - | AdHocTask : - { description : Text } - | HabiticaTask : - { task : - < HabiticaDaily - | HabiticaTodo - > - } - | Mail : { id : Text } - > - } - > - } - | ChildrenList : { uuid : Text } - | DependenciesList : { uuid : Text } - | HabiticaList : - { list : < HabiticaDailys | HabiticaTodos > } - | Mails - > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : + { list : < HabiticaDailys | HabiticaTodos > } + | Mails + > } , uiFeatures : { sortInTag : Bool @@ -238,65 +342,115 @@ BackendConfig = { users : } } }, -Widget = < SearchWidget | ConfigListWidget : { name : Text, limit : Optional Natural } >, +Widget = < SearchWidget +| DefinitionElementWidget : + { name : Text + , definitionElement : + < ConfigList : { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : { task : < HabiticaDaily | HabiticaTodo > } + | Mail : { id : Text } + > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : { list : < HabiticaDailys | HabiticaTodos > } + | Mails + > + } +>, NamedListQuery = { name : Text , list : - < QueryList : - { query : - List - < HasProperty : - { property : - < DescriptionMatches : { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > - } - | HasntProperty : - { property : - < DescriptionMatches : { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > - } + List + < ConfigList : { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : { task : < HabiticaDaily | HabiticaTodo > } + | Mail : { id : Text } > - } - | TagList : { name : Text } - | DefinitionList : - { elements : - List - < ConfigList : { name : Text, limit : Optional Natural } - | ListElement : - { item : - < TaskwarriorTask : { uuid : Text } - | AdHocTask : { description : Text } - | HabiticaTask : - { task : < HabiticaDaily | HabiticaTodo > } - | Mail : { id : Text } - > - } - > - } - | ChildrenList : { uuid : Text } - | DependenciesList : { uuid : Text } - | HabiticaList : { list : < HabiticaDailys | HabiticaTodos > } - | Mails - > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : { list : < HabiticaDailys | HabiticaTodos > } + | Mails + > }, LocalBackend = < TaskwarriorBackend : { taskRcPath : Optional Text @@ -372,82 +526,140 @@ StandaloneConfig = { backends : { viewList : List < SearchWidget - | ConfigListWidget : - { name : Text, limit : Optional Natural } + | DefinitionElementWidget : + { name : Text + , definitionElement : + < ConfigList : + { name : Text + , limit : Optional Natural + } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : + { task : + < HabiticaDaily + | HabiticaTodo + > + } + | Mail : { id : Text } + > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : + { list : + < HabiticaDailys | HabiticaTodos > + } + | Mails + > + } > , configuredLists : List { name : Text , list : - < QueryList : - { query : - List - < HasProperty : - { property : - < DescriptionMatches : - { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > - } - | HasntProperty : - { property : - < DescriptionMatches : - { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent + List + < ConfigList : + { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : + { task : + < HabiticaDaily + | HabiticaTodo > } + | Mail : { id : Text } > - } - | TagList : { name : Text } - | DefinitionList : - { elements : - List - < ConfigList : - { name : Text - , limit : Optional Natural - } - | ListElement : - { item : - < TaskwarriorTask : - { uuid : Text } - | AdHocTask : - { description : Text } - | HabiticaTask : - { task : - < HabiticaDaily - | HabiticaTodo - > - } - | Mail : { id : Text } - > - } - > - } - | ChildrenList : { uuid : Text } - | DependenciesList : { uuid : Text } - | HabiticaList : - { list : < HabiticaDailys | HabiticaTodos > - } - | Mails - > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : + { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : + { list : + < HabiticaDailys | HabiticaTodos > + } + | Mails + > } , uiFeatures : { sortInTag : Bool @@ -494,71 +706,120 @@ AccountConfig = { passwordHash : Text { viewList : List < SearchWidget - | ConfigListWidget : { name : Text, limit : Optional Natural } + | DefinitionElementWidget : + { name : Text + , definitionElement : + < ConfigList : { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : + { task : < HabiticaDaily | HabiticaTodo > } + | Mail : { id : Text } + > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : + { list : < HabiticaDailys | HabiticaTodos > } + | Mails + > + } > , configuredLists : List { name : Text , list : - < QueryList : - { query : - List - < HasProperty : - { property : - < DescriptionMatches : { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > - } - | HasntProperty : - { property : - < DescriptionMatches : { filter : Text } - | ParentBlocked - | Blocked - | Waiting - | Pending - | Completed - | Deleted - | IsParent - | OnList - | HasTag : { tag : Text } - | HasParent - > - } + List + < ConfigList : { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : + { task : < HabiticaDaily | HabiticaTodo > } + | Mail : { id : Text } > - } - | TagList : { name : Text } - | DefinitionList : - { elements : - List - < ConfigList : - { name : Text, limit : Optional Natural } - | ListElement : - { item : - < TaskwarriorTask : { uuid : Text } - | AdHocTask : { description : Text } - | HabiticaTask : - { task : - < HabiticaDaily | HabiticaTodo > - } - | Mail : { id : Text } - > - } - > - } - | ChildrenList : { uuid : Text } - | DependenciesList : { uuid : Text } - | HabiticaList : { list : < HabiticaDailys | HabiticaTodos > } - | Mails - > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : + { list : < HabiticaDailys | HabiticaTodos > } + | Mails + > } , uiFeatures : { sortInTag : Bool @@ -577,8 +838,7 @@ DefinitionElement = < ConfigList : { name : Text, limit : Optional Natural } | Mail : { id : Text } > } ->, -ListQuery = < QueryList : +| QueryList : { query : List < HasProperty : @@ -614,25 +874,62 @@ ListQuery = < QueryList : > } | TagList : { name : Text } -| DefinitionList : - { elements : - List - < ConfigList : { name : Text, limit : Optional Natural } - | ListElement : - { item : - < TaskwarriorTask : { uuid : Text } - | AdHocTask : { description : Text } - | HabiticaTask : { task : < HabiticaDaily | HabiticaTodo > } - | Mail : { id : Text } - > - } - > - } | ChildrenList : { uuid : Text } | DependenciesList : { uuid : Text } | HabiticaList : { list : < HabiticaDailys | HabiticaTodos > } | Mails >, +ListQuery = List + < ConfigList : { name : Text, limit : Optional Natural } + | ListElement : + { item : + < TaskwarriorTask : { uuid : Text } + | AdHocTask : { description : Text } + | HabiticaTask : { task : < HabiticaDaily | HabiticaTodo > } + | Mail : { id : Text } + > + } + | QueryList : + { query : + List + < HasProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + | HasntProperty : + { property : + < DescriptionMatches : { filter : Text } + | ParentBlocked + | Blocked + | Waiting + | Pending + | Completed + | Deleted + | IsParent + | OnList + | HasTag : { tag : Text } + | HasParent + > + } + > + } + | TagList : { name : Text } + | ChildrenList : { uuid : Text } + | DependenciesList : { uuid : Text } + | HabiticaList : { list : < HabiticaDailys | HabiticaTodos > } + | Mails + >, RemoteBackend = { url : Text , user : Text , password : diff --git a/nix/sources.json b/nix/sources.json index b71a7625..ed65bc06 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -34,7 +34,7 @@ "branch": "master", "ref": "master", "repo": "git@hera.m-0.eu:kassandra2", - "rev": "0f2e5ad6580f00029d2c18357dbaadb9528cc48e", + "rev": "b77b43523bdd12b4f60af675f304cc30fcf51b1e", "type": "git" }, "logfeed": { diff --git a/private b/private index df590597..7133a4f2 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit df5905971d0d53e0fcf6b74b727c5e635b068f0c +Subproject commit 7133a4f24bde7cb1a509c8bd5a1968a15ea88452