Skip to content

Commit

Permalink
try to use hls 2.9.0.1 github tag
Browse files Browse the repository at this point in the history
  • Loading branch information
carbolymer committed Jan 24, 2025
1 parent 3e2e43f commit 5db0ffb
Showing 1 changed file with 23 additions and 2 deletions.
25 changes: 23 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,26 @@
# Used for cross compilation, and so referenced in .github/workflows/release-upload.yml. Adapt the
# latter if you change this value.
crossCompilerVersion = "ghc966";

hls2901overlay = final: prev:
let
hlsExes =
(final.haskell-nix.cabalProject {
src = final.fetchFromGitHub {
owner = "haskell";
repo = "haskell-language-server";
rev = "2.9.0.1";
hash = "sha256-wy348++MiMm/xwtI9M3vVpqj2qfGgnDcZIGXw8sF1sA=";
};
# index-state = "2024-12-24T12:56:48Z";
compiler-nix-name = defaultCompiler;
})
.haskell-language-server
.components
.exes;
in {
inherit (hlsExes) haskell-language-server haskell-language-server-wrapper;
};
in
{inherit (inputs) incl;}
// inputs.flake-utils.lib.eachSystem supportedSystems (
Expand All @@ -40,6 +60,7 @@
inputs.haskellNix.overlay
# configure haskell.nix to use iohk-nix crypto librairies.
inputs.iohkNix.overlays.haskell-nix-crypto
hls2901overlay
];
inherit system;
inherit (inputs.haskellNix) config;
Expand Down Expand Up @@ -91,12 +112,12 @@
# tools that work only with default compiler
cabal-gild = "1.3.1.2";
fourmolu = "0.17.0.0";
haskell-language-server = "2.9.0.0"; # nixpkgs.haskell-nix.sources."hls-2.9";
# haskell-language-server = "2.9.0.0"; # nixpkgs.haskell-nix.sources."hls-2.9";
hlint = "3.8";
stylish-haskell = "0.14.6.0";
};
# and from nixpkgs or other inputs
shell.nativeBuildInputs = with nixpkgs; [gh jq yq-go actionlint shellcheck] ++ (lib.optional isDarwin macOS-security);
shell.nativeBuildInputs = with nixpkgs; [gh jq yq-go actionlint shellcheck haskell-language-server haskell-language-server-wrapper] ++ (lib.optional isDarwin macOS-security);
# disable Hoogle until someone request it
shell.withHoogle = false;
# Skip cross compilers for the shell
Expand Down

0 comments on commit 5db0ffb

Please sign in to comment.