From cd62fd79c9efdaf2021719ea37640618a5b210a4 Mon Sep 17 00:00:00 2001
From: Gonzalo Balabasquer <gbalabasquer@gmail.com>
Date: Wed, 6 Jan 2021 12:54:17 -0300
Subject: [PATCH] Upgrade travis to use a newer dapptools version and using the
 method without cloning

---
 .travis.yml |  5 ++---
 shell.nix   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 shell.nix

diff --git a/.travis.yml b/.travis.yml
index 02e7d367..06cdcafc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,8 @@ language: nix
 nix: 2.3.6
 before_install:
   - nix-env -iA nixpkgs.cachix
+  - nix-env -f https://github.com/dapphub/dapptools/archive/master.tar.gz -iA solc-static-versions.solc_0_5_12
   - echo "trusted-users = root travis" | sudo tee -a /etc/nix/nix.conf && sudo pkill nix-daemon
   - cachix use maker
-  - git clone --recursive https://github.com/dapphub/dapptools $HOME/.dapp/dapptools
-  - nix-env -f https://github.com/makerdao/makerpkgs/tarball/master -iA dappPkgsVersions.hevm-0_42_0.dapp
 script:
-  - dapp --use solc:0.5.12 test
+  - nix-shell --pure --run 'dapp --use solc:0.5.12 test'
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 00000000..d5724891
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,12 @@
+{ dappPkgs ? (
+    import (fetchTarball "https://github.com/makerdao/makerpkgs/tarball/master") {}
+  ).dappPkgsVersions.hevm-0_43_1
+}: with dappPkgs;
+
+mkShell {
+  buildInputs = [
+    (dapp.override {
+      solc = solc-static-versions.solc_0_5_12;
+    })
+  ];
+}