File tree Expand file tree Collapse file tree 8 files changed +1259
-4249
lines changed Expand file tree Collapse file tree 8 files changed +1259
-4249
lines changed Original file line number Diff line number Diff line change @@ -64,4 +64,3 @@ case "$(uname)" in
6464 ;;
6565esac
6666
67-
Original file line number Diff line number Diff line change @@ -137,9 +137,6 @@ install_ghcup() {
137137 else
138138 curl --proto ' =https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 sh
139139 source " $( dirname " ${GHCUP_BIN} " ) /env"
140- # make sure we use the vanilla channel for installing binaries
141- # see https://github.com/haskell/ghcup-metadata/pull/166#issuecomment-1893075575
142- ghcup config set url-source https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/master/ghcup-vanilla-0.0.9.yaml
143140 ghcup install cabal --set " ${BOOTSTRAP_HASKELL_CABAL_VERSION} "
144141 fi
145142}
Original file line number Diff line number Diff line change 1111export PATH=" $HOME /.local/bin:$PATH "
1212
1313export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
14- export BOOTSTRAP_HASKELL_CABAL_VERSION=" ${CABAL_VER:- 3.10.3.0 } "
14+ export BOOTSTRAP_HASKELL_CABAL_VERSION=" ${CABAL_VER:- 3.14.1.1-p1 } "
1515export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=no
1616export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes
1717export BOOTSTRAP_HASKELL_ADJUST_BASHRC=1
Original file line number Diff line number Diff line change @@ -59,9 +59,9 @@ test_all_hls() {
5959 fi
6060 fi
6161 done
62- # install the recommended GHC version so the wrapper can launch HLS
63- ghcup install ghc --set 9.10.1
62+ ghcup install ghc --set recommended
6463 " $bindir /haskell-language-server-wrapper${ext} " typecheck " ${test_module} " || fail " failed to typecheck with HLS wrapper"
64+ ghcup rm ghc " $( ghc --numeric-version) "
6565}
6666
6767uname -a
You can’t perform that action at this time.
0 commit comments