haskellPackages.haskell-language-server: fix or bump deps (#525752)

This commit is contained in:
Alexandre Esteves 2026-06-22 00:38:49 +00:00 committed by GitHub
commit 4cbc2251c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 55 additions and 424 deletions

View file

@ -68,7 +68,7 @@ haskellPackages.mkDerivation {
hashable
isocline
lens
lsp_2_8_0_0
lsp
mtl
network
network-simple

View file

@ -198,25 +198,12 @@ with haskellLib;
}
);
# First to upgrade to lsp >= 2.8 while HLS hasn't yet had a compatible release
futhark = super.futhark.override {
lsp = self.lsp_2_8_0_0;
lsp-test =
overrideCabal
(old: {
testTargets = [
"tests"
"func-test"
];
})
(
self.lsp-test_0_18_0_0.override {
lsp = self.lsp_2_8_0_0;
lsp-types = self.lsp-types_2_4_0_0;
}
);
lsp-types = self.lsp-types_2_4_0_0;
};
lsp-test = overrideCabal (old: {
testTargets = [
"tests"
"func-test"
];
}) super.lsp-test;
#######################################
### HASKELL-LANGUAGE-SERVER SECTION ###
@ -280,7 +267,6 @@ with haskellLib;
haskell-language-server
hls-plugin-api
ghcide
lsp-types
;
# For -f-auto see cabal.project in haskell-language-server.
@ -297,6 +283,14 @@ with haskellLib;
})
] super.cabal-add;
stylish-haskell = appendPatches [
(pkgs.fetchpatch {
name = "bump-optparse-applicative.patch";
url = "https://github.com/haskell/stylish-haskell/commit/d1bc9bb91a0f9b122f2d4348022ce0fa1566124f.patch";
hash = "sha256-kRP4mABb1rlrx4GBPTozOS9fPudSzb36JcTKA8VMhgw=";
})
] super.stylish-haskell;
###########################################
### END HASKELL-LANGUAGE-SERVER SECTION ###
###########################################

View file

@ -81,7 +81,6 @@ with haskellLib;
#
ghc-exactprint = doDistribute self.ghc-exactprint_1_14_0_0;
hie-bios = doDistribute (dontCheck self.hie-bios_0_19_0); # Tests access homeless-shelter.
#
# Jailbreaks

View file

@ -32,9 +32,6 @@ default-package-overrides:
- extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
# 2026-01-30: Needs to match hasql from Stackage LTS 24
- hasql-notifications < 0.2.5.0
# 2026-02-04: as requested by ghcide >= 2.13
- hie-bios < 0.18.0
- hiedb < 0.8.0
# 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
# https://github.com/haskell-nix/hnix/pull/1112
# Note: When removing this, also remove hnix-store-core from maintainers/scripts/haskell/update-stackage.sh
@ -49,10 +46,6 @@ default-package-overrides:
# liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10)
- liquidhaskell == 0.9.10.*
- liquidhaskell-boot == 0.9.10.*
# 2025-03-07: HLS and many other pkgs don't support lsp >= 2.8 (yet)
- lsp < 2.8
- lsp-test < 0.18
- lsp-types < 2.4
# Needs to match microlens == 0.4.* in Stackage LTS 24
- microlens-pro < 0.2.0.4
# 2026-04-06: 4.0.10 merely adjusts to dependencies that are incompatible with our LTS
@ -144,11 +137,14 @@ package-maintainers:
- basic-sop
- commutative-semigroups
- generics-sop
- ghcide
- ghcjs-base
- ghcjs-dom
- ghcjs-dom-javascript
- ghcjs-dom-jsaddle
- haskell-debugger
- hie-bios
- hiedb
- jsaddle
- jsaddle-clib
- jsaddle-dom
@ -159,6 +155,9 @@ package-maintainers:
- large-records
- lens-sop
- linux-namespaces
- lsp
- lsp-test
- lsp-types
- monoidal-containers
- proto-lens-arbitrary
- proto3-suite

View file

@ -191,8 +191,11 @@ dont-distribute-packages:
- babylon
- backblaze-b2-hs
- backdropper
- baikai
- baikai-claude
- baikai-effectful
- baikai-openai
- baikai-trace-otel
- balkon
- ballast
- bamboo
@ -2671,6 +2674,7 @@ dont-distribute-packages:
- pms-domain-service
- pms-infra-agent-process
- pms-infra-agent-serial
- pms-infra-agent-server
- pms-infra-agent-socket
- pms-infra-cmdrun
- pms-infra-filesystem
@ -3189,6 +3193,16 @@ dont-distribute-packages:
- shibuya-kafka-adapter
- shibuya-metrics
- shibuya-pgmq-adapter
- shikumi
- shikumi-cache
- shikumi-cache-postgres
- shikumi-cache-redis
- shikumi-compile
- shikumi-eval
- shikumi-optimize
- shikumi-tools
- shikumi-trace
- shikumi-trace-otel
- shine-varying
- short-vec
- short-vec-lens

View file

@ -1141,13 +1141,6 @@ builtins.intersectAttrs super {
];
}) super.lsp-test;
lsp_2_8_0_0 = doDistribute (
super.lsp_2_8_0_0.override {
lsp-types = self.lsp-types_2_4_0_0;
}
);
lsp-types_2_4_0_0 = doDistribute super.lsp-types_2_4_0_0;
# the test suite attempts to run the binaries built in this package
# through $PATH but they aren't in $PATH
dhall-lsp-server = dontCheck super.dhall-lsp-server;

View file

@ -98193,6 +98193,7 @@ self: {
];
description = "Unified Haskell interface for multiple AI providers";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "baikai-gen-models";
}
) { };
@ -98306,6 +98307,7 @@ self: {
];
description = "effectful binding for the baikai AI-provider transport";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -98431,6 +98433,7 @@ self: {
];
description = "OpenTelemetry TraceSink for baikai";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -270105,6 +270108,7 @@ self: {
description = "The core of an IDE";
license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
mainProgram = "ghcide";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@ -335754,103 +335758,6 @@ self: {
) { };
hie-bios = callPackage (
{
mkDerivation,
aeson,
base,
base16-bytestring,
bytestring,
co-log-core,
conduit,
conduit-extra,
cryptohash-sha1,
deepseq,
directory,
exceptions,
extra,
file-embed,
filepath,
ghc,
optparse-applicative,
prettyprinter,
tasty,
tasty-expected-failure,
tasty-hunit,
template-haskell,
temporary,
text,
time,
transformers,
unix-compat,
unordered-containers,
yaml,
}:
mkDerivation {
pname = "hie-bios";
version = "0.17.0";
sha256 = "0dgkckj73zknnhgnval0igb3v183ygyda65mfyibqmrm05phk9yi";
revision = "1";
editedCabalFile = "1ayi02194h4fqbrd797lv0r0apzrwv368ghndyyd8s7v5qj8r928";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson
base
base16-bytestring
bytestring
co-log-core
conduit
conduit-extra
cryptohash-sha1
deepseq
directory
exceptions
extra
file-embed
filepath
ghc
prettyprinter
template-haskell
temporary
text
time
transformers
unix-compat
unordered-containers
yaml
];
executableHaskellDepends = [
base
co-log-core
directory
filepath
optparse-applicative
prettyprinter
];
testHaskellDepends = [
aeson
base
co-log-core
directory
extra
filepath
ghc
prettyprinter
tasty
tasty-expected-failure
tasty-hunit
temporary
text
transformers
yaml
];
description = "Set up a GHC API session";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
mainProgram = "hie-bios";
}
) { };
hie-bios_0_19_0 = callPackage (
{
mkDerivation,
aeson,
@ -335941,8 +335848,8 @@ self: {
];
description = "Set up a GHC API session";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hie-bios";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@ -336169,6 +336076,7 @@ self: {
description = "Generates a references DB from .hie files";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
mainProgram = "hiedb";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@ -445170,89 +445078,6 @@ self: {
) { inherit (pkgs) rocksdb; };
lsp = callPackage (
{
mkDerivation,
aeson,
async,
attoparsec,
base,
bytestring,
co-log-core,
containers,
data-default,
directory,
exceptions,
extra,
filepath,
hashable,
hspec,
hspec-discover,
lens,
lens-aeson,
lsp-types,
mtl,
prettyprinter,
sorted-list,
stm,
text,
text-rope,
transformers,
unliftio,
unliftio-core,
unordered-containers,
}:
mkDerivation {
pname = "lsp";
version = "2.7.0.1";
sha256 = "1z3kc0vpgijzg56n70vmbi9draxzk02fifz83kgjq73rjc2scp7w";
revision = "1";
editedCabalFile = "1lq1gs8b47k3fv79lwz6a9zfkkywp95jy7xzxh0sb5k21x5yy7m9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson
async
attoparsec
base
bytestring
co-log-core
containers
data-default
directory
exceptions
extra
filepath
hashable
lens
lens-aeson
lsp-types
mtl
prettyprinter
sorted-list
stm
text
text-rope
transformers
unliftio
unliftio-core
unordered-containers
];
testHaskellDepends = [
base
containers
hspec
sorted-list
text
text-rope
unordered-containers
];
testToolDepends = [ hspec-discover ];
description = "Haskell library for the Microsoft Language Server Protocol";
license = lib.meta.getLicenseFromSpdxId "MIT";
}
) { };
lsp_2_8_0_0 = callPackage (
{
mkDerivation,
aeson,
@ -445332,7 +445157,7 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Haskell library for the Microsoft Language Server Protocol";
license = lib.meta.getLicenseFromSpdxId "MIT";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@ -445417,106 +445242,6 @@ self: {
) { };
lsp-test = callPackage (
{
mkDerivation,
aeson,
aeson-pretty,
ansi-terminal,
async,
base,
bytestring,
co-log-core,
conduit,
conduit-parse,
containers,
data-default,
Diff,
directory,
exceptions,
extra,
filepath,
Glob,
hspec,
lens,
lens-aeson,
lsp,
lsp-types,
mtl,
parser-combinators,
process,
some,
text,
time,
transformers,
unix,
unliftio,
}:
mkDerivation {
pname = "lsp-test";
version = "0.17.1.1";
sha256 = "1mba3xv44qcxvhn24az6lj0i2kk4np7sx4bn05hzcl5sydjlzdaa";
libraryHaskellDepends = [
aeson
aeson-pretty
ansi-terminal
async
base
bytestring
co-log-core
conduit
conduit-parse
containers
data-default
Diff
directory
exceptions
extra
filepath
Glob
lens
lens-aeson
lsp
lsp-types
mtl
parser-combinators
process
some
text
time
transformers
unix
];
testHaskellDepends = [
aeson
base
co-log-core
containers
data-default
directory
extra
filepath
hspec
lens
lsp
mtl
parser-combinators
process
text
unliftio
];
testToolDepends = [ lsp ];
benchmarkHaskellDepends = [
base
extra
lsp
process
];
description = "Functional test framework for LSP servers";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
}
) { };
lsp-test_0_18_0_0 = callPackage (
{
mkDerivation,
aeson,
@ -445613,115 +445338,11 @@ self: {
];
description = "Functional test framework for LSP servers";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
lsp-types = callPackage (
{
mkDerivation,
aeson,
base,
binary,
containers,
data-default,
deepseq,
Diff,
directory,
dlist,
exceptions,
file-embed,
filepath,
generic-arbitrary,
hashable,
hspec,
hspec-discover,
hspec-golden,
indexed-traversable,
indexed-traversable-instances,
lens,
mod,
mtl,
network-uri,
prettyprinter,
QuickCheck,
quickcheck-instances,
regex,
row-types,
safe,
some,
template-haskell,
text,
witherable,
}:
mkDerivation {
pname = "lsp-types";
version = "2.3.0.1";
sha256 = "0ygq73miijswpqx1bi1dfr7ia4qs22pl8485sqsi4d6ybwlrnln6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson
base
binary
containers
data-default
deepseq
Diff
dlist
exceptions
file-embed
filepath
generic-arbitrary
hashable
indexed-traversable
indexed-traversable-instances
lens
mod
mtl
network-uri
prettyprinter
QuickCheck
quickcheck-instances
row-types
safe
some
template-haskell
text
];
executableHaskellDepends = [
base
containers
directory
filepath
mtl
prettyprinter
regex
text
witherable
];
testHaskellDepends = [
aeson
base
filepath
hspec
hspec-golden
lens
network-uri
prettyprinter
QuickCheck
quickcheck-instances
text
];
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "Haskell library for the Microsoft Language Server Protocol, data types";
license = lib.meta.getLicenseFromSpdxId "MIT";
mainProgram = "generator";
}
) { };
lsp-types_2_4_0_0 = callPackage (
{
mkDerivation,
aeson,
@ -445821,8 +445442,8 @@ self: {
doHaddock = false;
description = "Haskell library for the Microsoft Language Server Protocol, data types";
license = lib.meta.getLicenseFromSpdxId "MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "generator";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@ -541943,6 +541564,7 @@ self: {
testToolDepends = [ hspec-discover ];
description = "TCP server listener library for pty-mcp-server agent tools";
license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -629765,6 +629387,7 @@ self: {
];
description = "Typed, structured, evaluable LM programs over baikai";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -629839,6 +629462,7 @@ self: {
];
description = "Content-addressed response caching for shikumi (EP-6)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -629888,6 +629512,7 @@ self: {
];
description = "Postgres-backed shikumi cache (EP-6)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -629939,6 +629564,7 @@ self: {
];
description = "Redis-backed shikumi cache (EP-6)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -629986,6 +629612,7 @@ self: {
];
description = "The compiler layer for shikumi LM programs (EP-9)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -630042,6 +629669,7 @@ self: {
];
description = "Typed evaluation framework for shikumi LM programs (EP-8)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -630099,6 +629727,7 @@ self: {
];
description = "The optimizer framework for shikumi LM programs (EP-10)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -630152,6 +629781,7 @@ self: {
];
description = "Typed tools and ReAct agents for shikumi LM programs (EP-11)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@ -630225,6 +629855,7 @@ self: {
];
description = "Hierarchical tracing, observability, and deterministic replay for shikumi (EP-7)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "shikumi-trace-demo";
}
) { };
@ -630283,6 +629914,7 @@ self: {
];
description = "OpenTelemetry export of shikumi hierarchical trace trees (EP-7)";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };