diff options
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 25 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 7 |
2 files changed, 6 insertions, 26 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2121aea4e626..7f4463d5e6b5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -102,34 +102,9 @@ self: super: { ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; })); - # hasn't bumped upper bounds - # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)" - # https://github.com/ennocramer/floskell/issues/48 - floskell = dontCheck (doJailbreak super.floskell); - - # 2023-04-03: https://github.com/haskell/haskell-language-server/issues/3546#issuecomment-1494139751 - # There will probably be a new revision soon. - hls-brittany-plugin = assert super.hls-brittany-plugin.version == "1.1.0.0"; doJailbreak super.hls-brittany-plugin; - # 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); - hls-test-utils = doJailbreak super.hls-test-utils; - hls-alternate-number-format-plugin = doJailbreak super.hls-alternate-number-format-plugin; - hls-cabal-plugin = doJailbreak super.hls-cabal-plugin; - hls-explicit-fixity-plugin = doJailbreak super.hls-explicit-fixity-plugin; - hls-floskell-plugin = doJailbreak super.hls-floskell-plugin; - hls-gadt-plugin = doJailbreak super.hls-gadt-plugin; - - hls-call-hierarchy-plugin = appendPatch (pkgs.fetchpatch { - url = "https://github.com/haskell/haskell-language-server/pull/3943.patch"; - relative = "plugins/hls-call-hierarchy-plugin"; - hash = "sha256-TOIn4/AGQr8o3r6gI6/vQsdWw/UGyO/599X0pCTYJjE="; - }) (doJailbreak super.hls-call-hierarchy-plugin); - - # 2024-01-15: allow hiedb 0.5 https://github.com/haskell/haskell-language-server/pull/3943 - ghcide = doJailbreak super.ghcide; - ########################################### ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 33f5fabbbae7..74cf3a36f545 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -114,7 +114,6 @@ self: super: builtins.intersectAttrs super { })) super) hls-brittany-plugin - hls-stan-plugin hls-floskell-plugin hls-fourmolu-plugin hls-overloaded-record-dot-plugin @@ -123,6 +122,9 @@ self: super: builtins.intersectAttrs super { # 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 @@ -173,6 +175,9 @@ self: super: builtins.intersectAttrs super { # 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 ; ########################################### |