upgrade dhall to 1.26.1 and merge types and termspolykinds

Previously, types were flattened and terms were nested (as are the
directories). For consistency, I made the types nested as well.

1 files changed, 21 insertions, 0 deletions

diff --git a/dhall/server/package.dhall b/dhall/server/package.dhall
new file mode 100644
index 0000000..e9e398c
--- /dev/null
+++ b/dhall/server/package.dhall
@@ -0,0 +1,21 @@
+let Service = ./service/package.dhall
+
+let Server =
+      { kong_app_admin_url : Text
+      , kong_app_admin_apikey : Text
+      , services : List Service.Type
+      }
+
+let Vault = ./../Vault.dhall
+
+let mkServer =
+        λ(vault : Vault)
+      → λ(adminUrl : Text)
+      → λ(services : List Service.Type)
+      →   { kong_app_admin_url = adminUrl
+          , kong_app_admin_apikey = vault.appAdminApiKey
+          , services = services
+          }
+        : Server
+
+in  { Service = Service, Type = Server, mkServer = mkServer }