aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpaulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com>2019-04-26 20:44:58 +0200
committerGitHub <noreply@github.com>2019-04-26 20:44:58 +0200
commit6bfc325c7b90a52dab15dd2ac624b4b9643d9d66 (patch)
treed26e1cf1a2752efdc197b505b6d9355e5702ca8e
parent6bddf5f0c6d72a710323bdd641e2abf52973fa6a (diff)
parent89cd41776076edfbbfe8ffb874a4e92d496e3ad2 (diff)
downloadansible-clever-6bfc325c7b90a52dab15dd2ac624b4b9643d9d66.tar.gz
ansible-clever-6bfc325c7b90a52dab15dd2ac624b4b9643d9d66.tar.zst
ansible-clever-6bfc325c7b90a52dab15dd2ac624b4b9643d9d66.zip
Merge pull request #41 from paulrbr-fl/dhall-version-upgradev1.20
dhall(upgrade): upgrade code to be compatible with dhall 1.21.0
-rw-r--r--.travis.yml5
-rw-r--r--dhall-1.18.nix16
-rw-r--r--dhall-1.21.0.nix22
-rw-r--r--dhall/addon/Postgresql.dhall2
4 files changed, 25 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml
index ef53f71..720eade 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,8 @@ language: nix
4sudo: false 4sudo: false
5 5
6install: 6install:
7 - nix-env -i python2.7-ansible 7 - nix-env -i python2.7-ansible python2.7-ansible-lint
8 - nix-env -i python2.7-ansible-lint 8 - nix-env -if ./dhall-1.21.0.nix
9 - nix-env -if ./dhall-1.18.nix
10 9
11 # Check ansible version 10 # Check ansible version
12 - ansible --version 11 - ansible --version
diff --git a/dhall-1.18.nix b/dhall-1.18.nix
deleted file mode 100644
index d6522bd..0000000
--- a/dhall-1.18.nix
+++ /dev/null
@@ -1,16 +0,0 @@
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-1.21.0.nix b/dhall-1.21.0.nix
new file mode 100644
index 0000000..e53369b
--- /dev/null
+++ b/dhall-1.21.0.nix
@@ -0,0 +1,22 @@
1{ pkgs ? import <nixpkgs> {} }: with pkgs;
2
3let
4 mkVersion =
5 version: sha256:
6 stdenv.mkDerivation {
7 name = "dhall-${version}";
8 inherit version;
9 src = fetchurl {
10 url = "https://github.com/dhall-lang/dhall-haskell/releases/download/${version}/dhall-${version}-x86_64-linux.tar.bz2";
11 inherit sha256;
12 };
13 unpackPhase = ''
14 tar -xjf $src
15 '';
16 installPhase = ''
17 mkdir -p $out/bin
18 mv bin/dhall $out/bin/
19 '';
20 };
21in
22 mkVersion "1.21.0" "0x7q6v1y62fq6724kx1hcfp1fcqv3lbv33ji6jzfd5y316a31r77"
diff --git a/dhall/addon/Postgresql.dhall b/dhall/addon/Postgresql.dhall
index 9dd9744..ed6b411 100644
--- a/dhall/addon/Postgresql.dhall
+++ b/dhall/addon/Postgresql.dhall
@@ -1,3 +1,3 @@
1 let addon = constructors ./Addon.dhall 1let addon = ./Addon.dhall
2 2
3in addon.Postgresql { name = "pg", env_prefix = "POSTGRESQL_ADDON" } 3in addon.Postgresql { name = "pg", env_prefix = "POSTGRESQL_ADDON" }