Skip to content

Commit

Permalink
Fixes for hydra eval
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Oct 16, 2023
1 parent dee15a4 commit 700e742
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"ghc902"
"ghc928"
"ghc947"
"ghc962"
"ghc963"
"ghc981"
"ghc99"] (compiler-nix-name:
pkgs.haskell-nix.compiler.${
Expand Down
4 changes: 2 additions & 2 deletions tool-map.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# see https://haskell-language-server.readthedocs.io/en/latest/support/ghc-version-support.html
# so we assume "latest" for all hls.
# for hlint however, we need hlint-3.3 for ghc-8.10.7.
let fixed-versions = { "hlint" = { "ghc8107" = { version = "3.3"; }; }; }; in
let fixed-versions = { "hlint" = { "ghc8107" = { version = "3.4.1"; }; "ghc902" = { version = "3.5"; }; }; }; in
compiler-nix-name: tool: {
# for HLS, we rely on the cabal.project configuration from the upstream project to have the correct configuration.
# Building HLS from hackage requires setting all those constraints as well, and just isn't practical to do for each
# HLS release. Therefore we rely on the HLS upstream repository to provide the proper configuration information.
haskell-language-server = {pkgs, ...}: rec {
# Use the github source of HLS that is tested with haskell.nix CI
src = pkgs.haskell-nix.sources."hls-2.4";
src = { "ghc8107" = pkgs.haskell-nix.sources."hls-2.2"; }.${compiler-nix-name} or pkgs.haskell-nix.sources."hls-2.4";
# `tool` normally ignores the `cabal.project` (if there is one in the hackage source).
# We need to use the github one (since it has settings to make hls build).
cabalProject = __readFile (src + "/cabal.project");
Expand Down

0 comments on commit 700e742

Please sign in to comment.