Merge pull request #54 from clementd-fretlink/polykinds

Migrate to dhall 1.26.1 and merge types and terms

.travis.yml

@@ -5,7 +5,7 @@ sudo: false
 
 install:
   - nix-env -i python2.7-ansible python2.7-ansible-lint ShellCheck-0.7.0
-  - nix-env -if ./dhall-1.21.0.nix
+  - nix-env -if ./dhall-1.26.1.nix
 
   # Check ansible version
   - ansible --version

dhall-1.21.0.nix → dhall-1.26.1.nix

@@ -19,4 +19,4 @@ let
         '';
       };
 in
-  mkVersion "1.21.0" "0x7q6v1y62fq6724kx1hcfp1fcqv3lbv33ji6jzfd5y316a31r77"
+  mkVersion "1.26.1" "0sl4r3mfairgd6kn26hs1r1lkh8rn992grd73078rhqf5w90ag05"

dhall/Addon.dhall

@@ -0,0 +1,6 @@
+let Addon = < Postgresql : { name : Text, env_prefix : Text } >
+
+let postgresql =
+      Addon.Postgresql { name = "pg", env_prefix = "POSTGRESQL_ADDON" }
+
+in  { Type = Addon, postgresql = postgresql }

dhall/Config.dhall

@@ -1,26 +1,38 @@
-let Addon = ./addon/Addon.dhall
+let Addon = (./Addon.dhall).Type
 
-in    λ(Environment : Type)
-    → { clever_app :
-          Text
-      , clever_orga :
-          Text
-      , clever_secret :
-          Text
-      , clever_token :
-          Text
-      , clever_syslog_server :
-          Optional Text
-      , clever_domain :
-          Optional Text
-      , clever_app_tasks_file :
-          Optional Text
-      , clever_haskell_entry_point :
-          Optional Text
-      , clever_disable_metrics :
-          Bool
-      , clever_addons :
-          List Addon
-      , clever_env :
-          Environment
-      }
+let Vault = ./Vault.dhall
+
+let Config =
+        λ(Environment : Type)
+      → { clever_app : Text
+        , clever_orga : Text
+        , clever_secret : Text
+        , clever_token : Text
+        , clever_syslog_server : Optional Text
+        , clever_domain : Optional Text
+        , clever_app_tasks_file : Optional Text
+        , clever_haskell_entry_point : Optional Text
+        , clever_disable_metrics : Bool
+        , clever_addons : List Addon
+        , clever_env : Environment
+        }
+
+let mkConfig =
+        λ(vault : Vault)
+      → λ(app : Text)
+      → λ(organization : Text)
+      →   { clever_app = app
+          , clever_orga = organization
+          , clever_secret = vault.secret
+          , clever_token = vault.token
+          , clever_syslog_server = None Text
+          , clever_domain = None Text
+          , clever_app_tasks_file = None Text
+          , clever_haskell_entry_point = None Text
+          , clever_disable_metrics = False
+          , clever_addons = [] : List Addon
+          , clever_env = {=}
+          }
+        : Config {}
+
+in  { Type = Config, mkConfig = mkConfig }

dhall/package.dhall

@@ -0,0 +1 @@
+{ Addon = ./Addon.dhall, Config = ./Config.dhall, Vault = ./Vault.dhall }