haskellPackages.ghcide: Fix ghcide and hie-bios

This is the haskell-updates version of #86659
This commit is contained in:
Malte Brandy 2020-05-03 16:51:09 +02:00 committed by Peter Simons
parent 5e242060a7
commit 5266ceb263
3 changed files with 17 additions and 2 deletions

View File

@ -1489,4 +1489,16 @@ self: super: {
selective = self.selective_0_4_1; selective = self.selective_0_4_1;
}; };
# Needed for ghcide
haskell-lsp_0_19_0_0 = super.haskell-lsp_0_19_0_0.override {
haskell-lsp-types = self.haskell-lsp-types_0_19_0_0;
};
# this will probably need to get updated with every ghcide update,
# we need an override because ghcide is tracking haskell-lsp closely.
ghcide = dontCheck (super.ghcide.override rec {
haskell-lsp-types = self.haskell-lsp-types_0_19_0_0;
haskell-lsp = self.haskell-lsp_0_19_0_0;
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -2397,6 +2397,8 @@ extra-packages:
- happy <1.19.6 # newer versions break Agda - happy <1.19.6 # newer versions break Agda
- happy == 1.19.9 # for purescript - happy == 1.19.9 # for purescript
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-lsp == 0.19.* # required for ghcide 0.1.0
- haskell-lsp-types == 0.19.* # required for ghcide 0.1.0
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hoogle == 5.0.14 # required by hie-hoogle - hoogle == 5.0.14 # required by hie-hoogle
@ -5072,7 +5074,6 @@ broken-packages:
- ghci-lib - ghci-lib
- ghci-ng - ghci-ng
- ghci-pretty - ghci-pretty
- ghcide
- ghcjs-dom-jsffi - ghcjs-dom-jsffi
- ghcjs-fetch - ghcjs-fetch
- ghcjs-hplay - ghcjs-hplay
@ -5871,7 +5872,6 @@ broken-packages:
- hichi - hichi
- hid-examples - hid-examples
- hidden-char - hidden-char
- hie-bios
- hie-core - hie-core
- hieraclus - hieraclus
- hierarchical-exceptions - hierarchical-exceptions

View File

@ -727,4 +727,7 @@ self: super: builtins.intersectAttrs super {
--prefix PATH : "${path}" --prefix PATH : "${path}"
''; '';
}); });
# Tests access homeless-shelter.
hie-bios = dontCheck super.hie-bios;
} }