Fix nix run for Travis (#203)

* Remove solc line from tavis file * Remove --use flag as solc is overwriten in shell.nix * Fix shell.nix
makerdao · Feb 16, 2021 · 0c816d7 · 0c816d7
1 parent 5fc42eb
commit 0c816d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,7 @@ 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
 script:
-  - nix-shell --pure --run 'dapp --use solc:0.5.12 test'
+  - nix-shell --pure --run 'dapp test'
diff --git a/shell.nix b/shell.nix
@@ -4,9 +4,9 @@
 }: with dappPkgs;
 
 mkShell {
+  DAPP_SOLC = solc-static-versions.solc_0_5_12 + "/bin/solc-0.5.12";
+  # SOLC_FLAGS = "--optimize --optimize-runs=200";
   buildInputs = [
-    (dapp.override {
-      solc = solc-static-versions.solc_0_5_12;
-    })
+    dapp
   ];
 }