From 117a573db72d925da7161fb9ee340800581ec673 Mon Sep 17 00:00:00 2001 From: Paul Bonaud Date: Tue, 8 Dec 2020 11:15:30 +0100 Subject: dhall: Add the MongoDB addon type to the Addon sum type --- dhall/Addon.dhall | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dhall/Addon.dhall b/dhall/Addon.dhall index b7ab958..4eb0613 100644 --- 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 } -- cgit v1.2.3 From 4c9962dd07f4249fa013dcafc3bc6ae9c8d12742 Mon Sep 17 00:00:00 2001 From: Paul Bonaud Date: Tue, 8 Dec 2020 11:28:45 +0100 Subject: dhall: upgrade minimum compatible Dhall version to at least 1.29.0 This commit also upgrades the nix channel used in the CI to be able to test with Dhall v1.34.0 --- .travis.yml | 2 +- README.md | 2 +- default.nix | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index e42204f..31c3ecf 100644 --- 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 499dced..c7d7415 100644 --- 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 15ee01e..d68a922 100644 --- 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; } -- cgit v1.2.3