cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskellPackages: Remove obsolete overrides for hls dependencies

Browse source
This commit is contained in:
maralorn 2024-03-17 13:36:19 +01:00
parent e2ec64eff0
commit 013cdb0c0b
6 changed files with 2 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/haskell-modules/configuration-arm.nix
View file

@ -70,7 +70,6 @@ self: super: {
headroom = dontCheck super.headroom;
hgeometry = dontCheck super.hgeometry;
hhp = dontCheck super.hhp;
hls-splice-plugin = dontCheck super.hls-splice-plugin;
hsakamai = dontCheck super.hsakamai;
hsemail-ns = dontCheck super.hsemail-ns;
html-validator-cli = dontCheck super.html-validator-cli;
@ -99,13 +98,6 @@ self: super: {
xml-html-qq = dontCheck super.xml-html-qq;
yaml-combinators = dontCheck super.yaml-combinators;
yesod-paginator = dontCheck super.yesod-paginator;
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin;
hls-class-plugin = dontCheck super.hls-class-plugin;
hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin;
# https://github.com/ekmett/half/issues/35
half = dontCheck super.half;
@ -116,11 +108,6 @@ self: super: {
# Similar RTS issue in test suite:
# rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed.
# These still fail sporadically on ghc 9.2
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
hls-rename-plugin = dontCheck super.hls-rename-plugin;
hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin;
hls-floskell-plugin = dontCheck super.hls-floskell-plugin;
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 {
# AARCH32-SPECIFIC OVERRIDES

14
pkgs/development/haskell-modules/configuration-darwin.nix
View file

@ -214,20 +214,6 @@ self: super: ({
] ++ (drv.libraryHaskellDepends or []);
}) super.cas-store;
# 2021-05-25: Tests fail and I have no way to debug them.
hls-class-plugin = dontCheck super.hls-class-plugin;
hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin;
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
hls-splice-plugin = dontCheck super.hls-splice-plugin;
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
hls-floskell-plugin = dontCheck super.hls-floskell-plugin;
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
# 2022-05-05: Tests fail and I have no way to debug them.
hls-rename-plugin = dontCheck super.hls-rename-plugin;
# We are lacking pure pgrep at the moment for tests to work
tmp-postgres = dontCheck super.tmp-postgres;

3
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file

@ -97,9 +97,6 @@ self: super: {
# This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore.
exceptions = self.exceptions_0_10_7;
# Older compilers need the latest ghc-lib to build this package.
hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin;
# vector 0.12.2 indroduced doctest checks that don’t work on older compilers
vector = dontCheck super.vector;

21
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -65,27 +65,13 @@ self: super: {
algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1;
});
hls-cabal-plugin = super.hls-cabal-plugin.override {
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
};
ormolu = self.ormolu_0_5_2_0.override {
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
};
stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0;
haskell-language-server = lib.pipe (super.haskell-language-server.override {
hls-ormolu-plugin = null;
hls-stylish-haskell-plugin = null;
hls-fourmolu-plugin = null;
# Not buildable if GHC > 9.2.3, so we ship no compatible GHC
hls-stan-plugin = null;
}) [
haskell-language-server = lib.pipe super.haskell-language-server [
(disableCabalFlag "fourmolu")
(disableCabalFlag "ormolu")
(disableCabalFlag "stylishHaskell")
];
# For GHC < 9.4, some packages need data-array-byte as an extra dependency
hashable = addBuildDepends [ self.data-array-byte ] super.hashable;
primitive = addBuildDepends [ self.data-array-byte ] super.primitive;
@ -118,9 +104,6 @@ self: super: {
# https://github.com/clash-lang/clash-compiler/blob/f0f6275e19b8c672f042026c478484c5fd45191d/README.md#ghc-compatibility
clash-prelude = dontDistribute (markBroken super.clash-prelude);
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = dontCheck super.hiedb;
# Too strict upper bound on bytestring, relevant for GHC 9.2.6 specifically
# https://github.com/protolude/protolude/issues/127#issuecomment-1428807874
protolude = doJailbreak super.protolude;

1
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file

@ -118,7 +118,6 @@ self: super: {
relude = dontCheck (doJailbreak super.relude);
inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super)
hls-cabal-plugin
ghc-trace-events
gi-cairo-connector # mtl <2.3
ghc-prof # base <4.18

78
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -102,84 +102,6 @@ self: super: builtins.intersectAttrs super {
# Tests access homeless-shelter.
hie-bios = dontCheck super.hie-bios;
# PLUGINS WITH ENABLED TESTS
# haskell-language-server plugins all use the same test harness so we give them what they want in this loop.
# Every hls plugin should either be in the test disabled list below, or up here in the list fixing it’s tests.
inherit (pkgs.lib.mapAttrs
(_: overrideCabal (drv: {
testToolDepends = (drv.testToolDepends or [ ]) ++ [ pkgs.git ];
preCheck = ''
export HOME=$TMPDIR/home
'' + (drv.preCheck or "");
}))
super)
hls-brittany-plugin
hls-floskell-plugin
hls-fourmolu-plugin
hls-overloaded-record-dot-plugin
;
# PLUGINS WITH DISABLED TESTS
# 2023-04-01: TODO: We should reenable all these tests to figure if they are still broken.
inherit (pkgs.lib.mapAttrs (_: dontCheck) super)
# Tests require ghcide-test-utils which is broken
hls-semantic-tokens-plugin
# Tests have file permissions expections that don’t work with the nix store.
hls-gadt-plugin
# https://github.com/haskell/haskell-language-server/pull/3431
hls-cabal-plugin
hls-cabal-fmt-plugin
hls-code-range-plugin
hls-explicit-record-fields-plugin
# Flaky tests
hls-explicit-fixity-plugin
hls-hlint-plugin
hls-pragmas-plugin
hls-class-plugin
hls-rename-plugin
hls-alternate-number-format-plugin
hls-qualify-imported-names-plugin
hls-haddock-comments-plugin
hls-tactics-plugin
hls-call-hierarchy-plugin
hls-selection-range-plugin
hls-ormolu-plugin
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
hls-eval-plugin
# 2021-06-20: Tests fail: https://github.com/haskell/haskell-language-server/issues/1949
hls-refine-imports-plugin
# 2021-11-20: https://github.com/haskell/haskell-language-server/pull/2373
hls-explicit-imports-plugin
# 2021-11-20: https://github.com/haskell/haskell-language-server/pull/2374
hls-module-name-plugin
# 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200
hls-refactor-plugin
# 2021-09-14: Tests are flaky.
hls-splice-plugin
# 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2205
hls-stylish-haskell-plugin
# 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
# 2024-01-25: Golden files are missing
hls-stan-plugin
;
###########################################
### END HASKELL-LANGUAGE-SERVER SECTION ###
###########################################