Merge pull request #78 from paulrbr-fl/add-mongo-addon

dhall: Add the MongoDB addon type to the Addon sum type

diff --git a/.travis.yml b/.travis.yml
index e42204f9257fbf295126d64ca1e6e044ffe5845d..31c3ecf49469fc8403430144f54fa94a0d60af52 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 language: nix
 nix: 2.3.4
 env:
-  - CUSTOM_NIX_PATH=nixpkgs=channel:nixos-20.03
+  - CUSTOM_NIX_PATH=nixpkgs=channel:nixos-20.09
 
 # Travis nix integration will install nix AFTER the environment variables are set
 # and the nix installer will overide NIX_PATH variable thus we need to re-export it

diff --git a/README.md b/README.md
index 499dced1836aa25c5b50c797fd0e6ffa377f741b..c7d7415eeb826c5c774d89f135c54ab5abb91107 100644 (file)
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Requirements
 
 This role requires [`clever-tools`](https://github.com/CleverCloud/clever-tools) CLI version `2.6.1` or higher.
 
-If you want to configure this role with [Dhall](https://dhall-lang.org/) instead of YAML, the role publishes dhall bindings defined in the `dhall/package.dhall` file. These bindings will need Dhall version `1.26.0` or higher.
+If you want to configure this role with [Dhall](https://dhall-lang.org/) instead of YAML, the role publishes dhall bindings defined in the `dhall/package.dhall` file. These bindings will need Dhall version `1.29.0` or higher.
 
 Role Variables
 --------------

diff --git a/default.nix b/default.nix
index 15ee01ea5bbab7d5e0e9bfa0cb8fb208122fb409..d68a922c69caf84a29a692a54aa983fb62b2a31d 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -3,9 +3,8 @@
 with pkgs;
 {
   inherit shellcheck
-          ansible_2_8;
-  inherit (python37Packages)
+          ansible_2_8
+          dhall;
+  inherit (python3Packages)
           ansible-lint;
-  inherit (haskellPackages)
-          dhall_1_27_0;
 }

diff --git a/dhall/Addon.dhall b/dhall/Addon.dhall
index b7ab9581191e743f43aacb1144f714175375176b..4eb0613db61fb241a5289191a53358195b0021c0 100644 (file)
--- a/dhall/Addon.dhall
+++ b/dhall/Addon.dhall
@@ -2,6 +2,7 @@ let Addon =
       < Postgresql : { name : Text, env_prefix : Text }
       | Mysql : { name : Text, env_prefix : Text }
       | Redis : { name : Text, env_prefix : Text }
+      | MongoDB : { name : Text, env_prefix : Text }
       >
 
 let postgresql =
@@ -11,4 +12,6 @@ let mysql = Addon.Mysql { name = "mysql", env_prefix = "MYSQL_ADDON" }
 
 let redis = Addon.Redis { name = "redis", env_prefix = "REDIS" }
 
-in  { Type = Addon, postgresql = postgresql, mysql = mysql, redis = redis }
+let mongodb = Addon.MongoDB { name = "mongodb", env_prefix = "MONGODB_ADDON" }
+
+in  { Type = Addon, postgresql, mysql, redis, mongodb }