Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1746,32 +1746,32 @@ with haskellLib;
# https://github.com/NixOS/nixpkgs/issues/198495
(dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql);

# Needs matching lsp-types
# Allow lens >= 5.3
lsp_2_4_0_0 = doDistribute (
doJailbreak (
super.lsp_2_4_0_0.override {
lsp-types = self.lsp-types_2_1_1_0;
}
)
);

# Needs matching lsp-types;
# Lift bound on sorted-list <0.2.2
lsp_2_1_0_0 = doDistribute (
doJailbreak (
super.lsp_2_1_0_0.override {
lsp-types = self.lsp-types_2_1_1_0;
}
)
);
# Lift bound on lens <5.3
lsp-types_2_1_1_0 = doDistribute (doJailbreak super.lsp-types_2_1_1_0);

# 2025-03-03: dhall-lsp-server-1.1.4 requires lsp-2.1.0.0
dhall-lsp-server = super.dhall-lsp-server.override {
lsp = self.lsp_2_1_0_0;
};
dhall-lsp-server =
appendPatches
[
# Add support for lsp >= 2.7
(pkgs.fetchpatch {
name = "dhall-lsp-server-lsp-2.7.patch";
url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch";
sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY=";
relative = "dhall-lsp-server";
})
# Fix build with text >= 2.1.2
(pkgs.fetchpatch {
name = "dhall-lsp-server-text-2.1.2.patch";
url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch";
hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA=";
relative = "dhall-lsp-server";
})
]
(
overrideCabal (drv: {
prePatch = ''
${drv.prePatch or ""}
${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal
'';
}) super.dhall-lsp-server
);

# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
reflex-dom-core = lib.pipe super.reflex-dom-core [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,6 @@ broken-packages:
- dhall-check # failure in job https://hydra.nixos.org/build/233206425 at 2023-09-02
- dhall-csv # failure in job https://hydra.nixos.org/build/233256049 at 2023-09-02
- dhall-fly # failure in job https://hydra.nixos.org/build/233220306 at 2023-09-02
- dhall-lsp-server # failure in job https://hydra.nixos.org/build/307610458 at 2025-09-19
- dhall-recursive-adt # failure in job https://hydra.nixos.org/build/233210665 at 2023-09-02
- dhall-text # failure in job https://hydra.nixos.org/build/233253809 at 2023-09-02
- dhall-text-shell # failure in job https://hydra.nixos.org/build/244399613 at 2024-01-01
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ extra-packages:
- hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6
- hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0
- language-javascript == 0.7.0.0 # required by purescript
- lsp < 2.5 # 2024-07-08: need for koka
- lsp == 2.1.* # 2024-02-28: need for dhall-lsp-server
- lsp-types == 2.1.* # 2024-02-28: need for dhall-lsp-server and koka
- network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.*
- ormolu == 0.5.2.0 # 2023-08-08: preserve for ghc 9.0
- ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat
Expand Down
275 changes: 0 additions & 275 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading