diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2020-03-07 14:19:40 +0000 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2020-03-07 14:19:40 +0000 |
| commit | a4017a4c75d7b893247f05d4f8fa2736eb8eebe1 (patch) | |
| tree | e1dd457282a0e37efdcd304bf4fddd6c0dbcc154 | |
| parent | 75df0ab8508723ed171727727aa8e61e0cc25f94 (diff) | |
| download | verismith-a4017a4c75d7b893247f05d4f8fa2736eb8eebe1.tar.gz verismith-a4017a4c75d7b893247f05d4f8fa2736eb8eebe1.zip | |
Fix travis build and .envrc
| -rw-r--r-- | .envrc | 9 | ||||
| -rw-r--r-- | .travis.yml | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -1 +1,8 @@ -use_nix +command -v lorri >/dev/null 2>&1 +lorri_available=$? + +if [[ $lorri_available -eq 0 ]]; then + eval "$(lorri direnv)" +else + use nix +fi diff --git a/.travis.yml b/.travis.yml index 942cd62..4ee507a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,6 @@ jobs: - name: "Nix build" env: NIX=1 -before_script: nix-env -i cabal ghc +before_script: nix-env -i cabal-install ghc script: ./scripts/build.sh |