colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.haskell-language-server: Fix build for version 1.10

Browse Source
This commit is contained in:
maralorn 2023-04-03 12:19:37 +02:00
parent e8215cb4f5
commit 637bbe5529
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -107,13 +107,6 @@ self: super: {
haskell-language-server = (lib.pipe super.haskell-language-server [
dontCheck
(disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways …
# Allow hls-call-hierarchy >= 1.2 which requires only a bound adjustment
(appendPatch (fetchpatch {
name = "hls-allow-hls-call-hierarchy-1.2.patch";
url = "https://github.com/haskell/haskell-language-server/commit/05b248dfacc307c3397b334635cb38298aee9563.patch";
includes = [ "haskell-language-server.cabal" ];
sha256 = "1v0zi1lv92p6xq54yw9swzaf24dxsi9lpk10sngg3ka654ikm7j5";
}))
]).overrideScope (lself: lsuper: {
# For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
# because some packages, like ormolu, need a newer Cabal version.
@ -123,7 +116,7 @@ self: super: {
# That means ghc-paths can just use the ghc included Cabal version,
# without causing package-db incoherence and we should do that because
# otherwise we have different versions of ghc-paths
# around with have the same abi-hash, which can lead to confusions and conflicts.
# around which have the same abi-hash, which can lead to confusions and conflicts.
ghc-paths = lsuper.ghc-paths.override { Cabal = null; };
});
@ -133,6 +126,13 @@ self: super: {
apply-refact = self.apply-refact_0_11_0_0;
};
hls-test-utils = appendPatch (fetchpatch {
name = "hls-test-utils-ghcide-1.10-compat.patch";
url = "https://github.com/haskell/haskell-language-server/commit/014c8f90249f11a8dfa1286e67d452ccfb42b2d0.patch";
relative = "hls-test-utils";
hash = "sha256-sBuqSmgCQSgbXV6KPEZcIP09wbx81q5xjSg7/slH2HQ=";
}) super.hls-test-utils;
# For -f-auto see cabal.project in haskell-language-server.
ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);

3
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -168,6 +168,9 @@ self: super: builtins.intersectAttrs super {
# Necesssary .txt files are not included in sdist.
# https://github.com/haskell/haskell-language-server/pull/2887
hls-change-type-signature-plugin
# 2023-04-03: https://github.com/haskell/haskell-language-server/issues/3549
hls-retrie-plugin
;
###########################################