BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskell.packages.ghc921.haskell-language-server: Fix build and enable

Browse source
This commit is contained in:
Malte Brandy 2022-02-05 03:14:13 +01:00
parent c87d14a770
commit b20fb1ba49
3 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ self: super: {
quickcheck-instances = super.quickcheck-instances_0_3_27; quickcheck-instances = super.quickcheck-instances_0_3_27;
regex-posix = doJailbreak super.regex-posix; regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv; resolv = doJailbreak super.resolv;
retrie = doDistribute self.retrie_1_2_0_1; retrie = doDistribute (dontCheck self.retrie_1_2_0_1);
semialign = super.semialign_1_2_0_1; semialign = super.semialign_1_2_0_1;
singleton-bool = doJailbreak super.singleton-bool; singleton-bool = doJailbreak super.singleton-bool;
scientific = doJailbreak super.scientific; scientific = doJailbreak super.scientific;
@ -241,4 +241,37 @@ self: super: {
# need bytestring >= 0.11 which is only bundled with GHC >= 9.2 # need bytestring >= 0.11 which is only bundled with GHC >= 9.2
regex-rure = doDistribute (markUnbroken super.regex-rure); regex-rure = doDistribute (markUnbroken super.regex-rure);
jacinda = doDistribute super.jacinda; jacinda = doDistribute super.jacinda;
some = doJailbreak super.some;
fourmolu = super.fourmolu_0_5_0_1;
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
lucid = doJailbreak super.lucid;
hashtables = doJailbreak super.hashtables;
primitive-extras = super.primitive-extras_0_10_1_4;
hiedb = doJailbreak super.hiedb;
# 2022-02-05: The following plugins don‘t work yet on ghc9.2.
# Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
haskell-language-server = appendConfigureFlags [
"-f-alternateNumberFormat"
"-f-class"
"-f-eval"
"-f-haddockComments"
"-f-hlint"
"-f-retrie"
"-f-splice"
"-f-tactics"
"-f-brittany"
"-f-stylish-haskell"
] (super.haskell-language-server.override {
hls-alternate-number-format-plugin = null;
hls-class-plugin = null;
hls-eval-plugin = null;
hls-haddock-comments-plugin = null;
hls-hlint-plugin = null;
hls-retrie-plugin = null;
hls-splice-plugin = null;
hls-tactics-plugin = null;
hls-brittany-plugin = null;
hls-stylish-haskell-plugin = null;
});
} }

2
pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
View file

@ -1,4 +1,4 @@
{ lib, supportedGhcVersions ? [ "884" "8107" "902" ], stdenv, haskellPackages { lib, supportedGhcVersions ? [ "884" "8107" "902" "921" ], stdenv, haskellPackages
, haskell }: , haskell }:
# #
# The recommended way to override this package is # The recommended way to override this package is

6
pkgs/top-level/release-haskell.nix
View file

@ -311,11 +311,7 @@ let
cabal2nix = released; cabal2nix = released;
cabal2nix-unstable = released; cabal2nix-unstable = released;
funcmp = released; funcmp = released;
haskell-language-server = [ haskell-language-server = released;
compilerNames.ghc884
compilerNames.ghc8107
compilerNames.ghc902
];
hoogle = released; hoogle = released;
hlint = released; hlint = released;
hsdns = released; hsdns = released;