From 3e250446f659f949ecb6bcc6df8036ebefb9a461 Mon Sep 17 00:00:00 2001 From: Christian Bush Date: Tue, 8 Dec 2020 10:31:56 -0800 Subject: [PATCH] Fixing out of date syntax so that config.dhall compiles --- dhall/defaults.dhall | 2 +- dhall/github.dhall | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dhall/defaults.dhall b/dhall/defaults.dhall index a506421..76e0fb8 100644 --- a/dhall/defaults.dhall +++ b/dhall/defaults.dhall @@ -1,7 +1,7 @@ let T = ./types.dhall -in let githubUserRole = constructors T.TF/GithubUserRole +in let githubUserRole = T.TF/GithubUserRole in let member = githubUserRole.member {=} in let admin = githubUserRole.admin {=} diff --git a/dhall/github.dhall b/dhall/github.dhall index 6222861..f2df9fd 100644 --- a/dhall/github.dhall +++ b/dhall/github.dhall @@ -11,8 +11,8 @@ in let TF/ref3 = \(scope : Text) -> \(k2 : Text) -> \(k3 : Text) -> "\${${scope} in let TF/toText = \(role: T.TF/GithubUserRole) -> merge { - admin = \(_ :{}) -> "admin" - , member = \(_ :{}) -> "member" + admin = \(_ : {}) -> "admin" + , member = \(_ : {}) -> "member" } role in let makeGithubMembership = \(username: Text) -> \(role: T.TF/GithubUserRole) -> @@ -60,8 +60,8 @@ in let makeGithubTeamMembership = \(u: T.GithubUser) -> : List T.TF/GithubTeamMembership in let emptyListToOptional = \(a: Type) -> \(l: List a) -> - if (null a l) then [] : Optional (List a) - else [l]: Optional (List a) + if (null a l) then None (List a) + else Some l in let build = \(config: T.Config) -> let github_membership = map T.GithubUser T.TF/GithubMembership makeGithubMembership config.users