diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-05-12 14:29:54 -0400 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2021-05-13 15:27:00 +0800 |
| commit | 2f4fdee16c3bd993c8cfce349d2087a5a956f7c5 (patch) | |
| tree | 24d767ce4d7af5d8f40010c4806d90c24f9e3589 /.gitlab/ci.sh | |
| parent | e0ded198e9ec1c8bb7253506569e7ae47818e791 (diff) | |
| download | haskell-wip/simplify-ci.tar.gz | |
gitlab-ci: Drop nix-shell logic from ci.shwip/simplify-ci
There is no reason why ci.sh should need to know about the shell.nix
environment used on Darwin. Shell.nix should rather export the
environment needed by ci.sh.
Diffstat (limited to '.gitlab/ci.sh')
| -rwxr-xr-x | .gitlab/ci.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 99c7e8bfa5..2e0118bf2f 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -176,13 +176,7 @@ function set_toolchain_paths() { *) ;; esac - if [[ -n "${IN_NIX_SHELL:-}" ]]; then - needs_toolchain="" - GHC="$(which ghc)" - CABAL="$(which cabal)" - HAPPY="$(which happy)" - ALEX="$(which alex)" - elif [[ -n "$needs_toolchain" ]]; then + if [[ -n "$needs_toolchain" ]]; then # These are populated by setup_toolchain GHC="$toolchain/bin/ghc$exe" CABAL="$toolchain/bin/cabal$exe" |