diff options
author | maralorn <mail@maralorn.de> | 2022-09-21 05:26:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-21 05:26:45 +0200 |
commit | 89c97c03edb3b645b0604ea9415bb4a06eb40921 (patch) | |
tree | 453ed0a86849d206967887c105301a3c00f392e9 /pkgs/development/haskell-modules/configuration-nix.nix | |
parent | a7d50b4e0988e4f53d2d3629c7b5f57c2736480f (diff) | |
parent | 7c2fda45cc67990994ee160309fb5ed2e8425ff3 (diff) |
Merge pull request #191987 from maralorn/hls-1.8
haskell-language-server: 1.7.0.0 -> 1.8.0.0
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a728aa6376b60..21016baede7b0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -498,6 +498,14 @@ self: super: builtins.intersectAttrs super { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; }) super.LDAP); + # Not running the "example" test because it requires a binary from lsps test + # suite which is not part of the output of lsp. + lsp-test = overrideCabal (old: { testTarget = "tests func-test"; }) super.lsp-test; + + # 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; + # Expects z3 to be on path so we replace it with a hard # # The tests expect additional solvers on the path, replace the @@ -935,11 +943,11 @@ self: super: builtins.intersectAttrs super { }) super.procex; # Test suite wants to run main executable - fourmolu_0_7_0_1 = overrideCabal (drv: { + fourmolu_0_8_2_0 = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_7_0_1; + }) super.fourmolu_0_8_2_0; # Apply a patch which hardcodes the store path of graphviz instead of using # whatever graphviz is in PATH. @@ -1053,9 +1061,13 @@ self: super: builtins.intersectAttrs super { hls-fourmolu-plugin hls-module-name-plugin hls-pragmas-plugin - hls-splice-plugin; + hls-splice-plugin + hls-refactor-plugin + hls-code-range-plugin + hls-explicit-fixity-plugin; # Tests have file permissions expections that don‘t work with the nix store. hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; + hls-gadt-plugin = dontCheck super.hls-gadt-plugin; # Flaky tests hls-hlint-plugin = dontCheck super.hls-hlint-plugin; |