From 3d17c5eb5948d7297112599a9ea852b5853b3260 Mon Sep 17 00:00:00 2001
From: Paul Bonaud <paul.bonaud@fretlink.com>
Date: Fri, 19 Jun 2020 17:37:16 +0200
Subject: core: define nix env for travis with a unique default.nix file

---
 .travis.yml      |  7 +++----
 default.nix      | 11 +++++++++++
 dhall-1.26.1.nix | 22 ----------------------
 3 files changed, 14 insertions(+), 26 deletions(-)
 create mode 100644 default.nix
 delete mode 100644 dhall-1.26.1.nix

diff --git a/.travis.yml b/.travis.yml
index d287c26..92f6295 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,12 @@
 ---
 sudo: false
 language: nix
-nix: 2.2.1
+nix: 2.3.4
 env:
-  - NIX_PATH=nixpkgs=channel:nixos-19.09
+  - NIX_PATH=nixpkgs=channel:nixos-20.03
 
 install:
-  - nix-env -iA pkgs.python37Packages.ansible-lint pkgs.python37Packages.ansible pkgs.shellcheck -f '<nixpkgs>'
-  - nix-env -if ./dhall-1.26.1.nix
+  - nix-env -i -f ./default.nix
 
   # Check ansible version
   - ansible --version
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..15ee01e
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,11 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+with pkgs;
+{
+  inherit shellcheck
+          ansible_2_8;
+  inherit (python37Packages)
+          ansible-lint;
+  inherit (haskellPackages)
+          dhall_1_27_0;
+}
diff --git a/dhall-1.26.1.nix b/dhall-1.26.1.nix
deleted file mode 100644
index 918a528..0000000
--- a/dhall-1.26.1.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ 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.26.1" "0sl4r3mfairgd6kn26hs1r1lkh8rn992grd73078rhqf5w90ag05"
-- 
cgit v1.2.3