Skip to content

Commit

Permalink
Merge pull request #41 from paulrbr-fl/dhall-version-upgrade
Browse files Browse the repository at this point in the history
dhall(upgrade): upgrade code to be compatible with dhall 1.21.0
  • Loading branch information
paulrbr-fl authored Apr 26, 2019
2 parents 6bddf5f + 89cd417 commit 6bfc325
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 20 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ language: nix
sudo: false

install:
- nix-env -i python2.7-ansible
- nix-env -i python2.7-ansible-lint
- nix-env -if ./dhall-1.18.nix
- nix-env -i python2.7-ansible python2.7-ansible-lint
- nix-env -if ./dhall-1.21.0.nix

# Check ansible version
- ansible --version
Expand Down
16 changes: 0 additions & 16 deletions dhall-1.18.nix

This file was deleted.

22 changes: 22 additions & 0 deletions dhall-1.21.0.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ pkgs ? import <nixpkgs> {} }: with pkgs;

let
mkVersion =
version: sha256:
stdenv.mkDerivation {
name = "dhall-${version}";
inherit version;
src = fetchurl {
url = "https://github.com/dhall-lang/dhall-haskell/releases/download/${version}/dhall-${version}-x86_64-linux.tar.bz2";
inherit sha256;
};
unpackPhase = ''
tar -xjf $src
'';
installPhase = ''
mkdir -p $out/bin
mv bin/dhall $out/bin/
'';
};
in
mkVersion "1.21.0" "0x7q6v1y62fq6724kx1hcfp1fcqv3lbv33ji6jzfd5y316a31r77"
2 changes: 1 addition & 1 deletion dhall/addon/Postgresql.dhall
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
let addon = constructors ./Addon.dhall
let addon = ./Addon.dhall

in addon.Postgresql { name = "pg", env_prefix = "POSTGRESQL_ADDON" }

0 comments on commit 6bfc325

Please sign in to comment.