haskell-language-server: Fix build
This commit is contained in:
@@ -205,11 +205,6 @@ with haskellLib;
|
||||
Cabal = lself.Cabal_3_14_2_0;
|
||||
# Jailbreaking cabal-install-parsers to make it pick Cabal 3.14 instead of 3.12.
|
||||
cabal-install-parsers = doJailbreak lsuper.cabal-install-parsers;
|
||||
# hls 2.11 needs older cabal-add than in stackage. Also copying over test fix override from configuration-nix.nix
|
||||
cabal-add = overrideCabal (drv: {
|
||||
# tests depend on executable
|
||||
preCheck = ''export PATH="$PWD/dist/build/cabal-add:$PATH"'';
|
||||
}) lself.cabal-add_0_1;
|
||||
# Need a newer version of extensions to be compatible with the newer Cabal
|
||||
extensions = doJailbreak lself.extensions_0_1_1_0;
|
||||
# For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
|
||||
@@ -230,7 +225,6 @@ with haskellLib;
|
||||
# HLS 2.11: Too strict bound on Diff 1.0.
|
||||
haskell-language-server = lib.pipe super.haskell-language-server [
|
||||
dontCheck
|
||||
doJailbreak
|
||||
(
|
||||
if versionOlder self.ghc.version "9.10" || versionOlder "9.11" self.ghc.version then
|
||||
addBuildDepends [
|
||||
@@ -242,8 +236,6 @@ with haskellLib;
|
||||
lib.id
|
||||
)
|
||||
];
|
||||
hls-plugin-api = doJailbreak super.hls-plugin-api; # HLS 2.11: Too strict bound on Diff 1.0.
|
||||
ghcide = doJailbreak super.ghcide; # HLS 2.11: Too strict bound on Diff 1.0.
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
@@ -27,8 +27,6 @@
|
||||
default-package-overrides:
|
||||
- chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10)
|
||||
- extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
|
||||
# 2025-07-26: HLS doesn't support hiedb >= 0.7 yet
|
||||
- hiedb < 0.7
|
||||
# 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
|
||||
# https://github.com/haskell-nix/hnix/pull/1112
|
||||
- hnix-store-core < 0.7
|
||||
|
||||
@@ -326707,75 +326707,6 @@ self: {
|
||||
) { };
|
||||
|
||||
hiedb = callPackage (
|
||||
{
|
||||
mkDerivation,
|
||||
algebraic-graphs,
|
||||
ansi-terminal,
|
||||
array,
|
||||
base,
|
||||
bytestring,
|
||||
containers,
|
||||
directory,
|
||||
extra,
|
||||
filepath,
|
||||
ghc,
|
||||
ghc-paths,
|
||||
hie-compat,
|
||||
hspec,
|
||||
lucid,
|
||||
mtl,
|
||||
optparse-applicative,
|
||||
process,
|
||||
sqlite-simple,
|
||||
temporary,
|
||||
terminal-size,
|
||||
text,
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hiedb";
|
||||
version = "0.6.0.2";
|
||||
sha256 = "0sfxykvg5n44lpjj069j25pnff30ckby8k3n7yhp8ixajfnfrb5i";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
algebraic-graphs
|
||||
ansi-terminal
|
||||
array
|
||||
base
|
||||
bytestring
|
||||
containers
|
||||
directory
|
||||
extra
|
||||
filepath
|
||||
ghc
|
||||
hie-compat
|
||||
lucid
|
||||
mtl
|
||||
optparse-applicative
|
||||
sqlite-simple
|
||||
terminal-size
|
||||
text
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base
|
||||
ghc-paths
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base
|
||||
directory
|
||||
filepath
|
||||
ghc-paths
|
||||
hspec
|
||||
process
|
||||
temporary
|
||||
];
|
||||
description = "Generates a references DB from .hie files";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
mainProgram = "hiedb";
|
||||
}
|
||||
) { };
|
||||
|
||||
hiedb_0_7_0_0 = callPackage (
|
||||
{
|
||||
mkDerivation,
|
||||
algebraic-graphs,
|
||||
@@ -326841,7 +326772,6 @@ self: {
|
||||
];
|
||||
description = "Generates a references DB from .hie files";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "hiedb";
|
||||
}
|
||||
) { };
|
||||
|
||||
Reference in New Issue
Block a user