aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--dhall-1.18.nix16
-rw-r--r--dhall/mkConfig.dhall3
-rwxr-xr-xscripts/dhall_check.sh1
4 files changed, 21 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 82ddcec..ef53f71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ sudo: false
6install: 6install:
7 - nix-env -i python2.7-ansible 7 - nix-env -i python2.7-ansible
8 - nix-env -i python2.7-ansible-lint 8 - nix-env -i python2.7-ansible-lint
9 - nix-env -if ./dhall-1.18.nix
9 10
10 # Check ansible version 11 # Check ansible version
11 - ansible --version 12 - ansible --version
@@ -20,6 +21,7 @@ script:
20 # Basic role syntax check 21 # Basic role syntax check
21 - ansible-playbook tests/test.yml -i tests/inventory --syntax-check 22 - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
22 - ansible-lint . 23 - ansible-lint .
24 - scripts/dhall_check.sh
23 25
24notifications: 26notifications:
25 slack: fretlink:pTIylIN7zkwRFuL3aHERmsbB 27 slack: fretlink:pTIylIN7zkwRFuL3aHERmsbB
diff --git a/dhall-1.18.nix b/dhall-1.18.nix
new file mode 100644
index 0000000..d6522bd
--- /dev/null
+++ b/dhall-1.18.nix
@@ -0,0 +1,16 @@
1{ pkgs ? import <nixpkgs> {} }: with pkgs;
2
3stdenv.mkDerivation rec {
4 name = "dhall-${version}";
5 version = "1.18.0";
6 phases = [ "installPhase "];
7 src = fetchurl {
8 url = "https://github.com/dhall-lang/dhall-haskell/releases/download/${version}/dhall-${version}-x86_64-linux.tar.bz2";
9 sha256 = "0jvw6ss96xifb21mzpvfjzvaffcnpj0jhpc4rd36cl2r22800qgx";
10 };
11 installPhase = ''
12 mkdir -p $out/bin
13 tar -xjf $src
14 mv bin/dhall $out/bin/
15 '';
16}
diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall
index a904332..5040f1c 100644
--- a/dhall/mkConfig.dhall
+++ b/dhall/mkConfig.dhall
@@ -13,6 +13,7 @@ in let nonifyEmpty =
13in λ(vault : Vault) 13in λ(vault : Vault)
14 → λ(app : Text) 14 → λ(app : Text)
15 → λ(entryPoint : Text) 15 → λ(entryPoint : Text)
16 → λ(metrics : Bool)
16 → λ(syslogServer : Optional Text) 17 → λ(syslogServer : Optional Text)
17 → λ(domain : Optional Text) 18 → λ(domain : Optional Text)
18 → λ(tasksFile : Optional Text) 19 → λ(tasksFile : Optional Text)
@@ -34,7 +35,7 @@ in λ(vault : Vault)
34 , clever_entry_point = 35 , clever_entry_point =
35 entryPoint 36 entryPoint
36 , clever_metrics = 37 , clever_metrics =
37 True 38 metrics
38 , clever_addons = 39 , clever_addons =
39 addons 40 addons
40 , clever_env = 41 , clever_env =
diff --git a/scripts/dhall_check.sh b/scripts/dhall_check.sh
index 009d570..a3413ec 100755
--- a/scripts/dhall_check.sh
+++ b/scripts/dhall_check.sh
@@ -13,6 +13,7 @@ go() {
13 for file in $(find -type f -name "*.dhall"); do 13 for file in $(find -type f -name "*.dhall"); do
14 pushd $(dirname $file); 14 pushd $(dirname $file);
15 cat $(basename $file) | dhall --explain resolve > /dev/null; 15 cat $(basename $file) | dhall --explain resolve > /dev/null;
16 echo "Typechecking ${file}"
16 if [ "$?" -ne "0" ]; then 17 if [ "$?" -ne "0" ]; then
17 echo "Failed to resolve $file" 18 echo "Failed to resolve $file"
18 ERROR=1; 19 ERROR=1;