git.iko.soy/typeable/nixpkgs
on master help sign in
haskellPackages.ghcide: Fix ghcide and hie-bios

This is the haskell-updates version of #86659

commit5266ceb263a42869793b48fdfc7dfc342c12fb9b authorMalte Brandy <malte.brandy@maralorn.de> dateSun 3 May 2020, 16:51 (7 years ago) parent5e24206
3 files changed+17−2
pkgs/development/haskell-modules/configuration-common.nix+12 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+2−2 pkgs/development/haskell-modules/configuration-nix.nix+3
pkgs/development/haskell-modules/configuration-common.nix+12
@@ -1489,4 +1489,16 @@ self: super: {
14891489 selective = self.selective_0_4_1;
14901490 };
14911491
1492+ # Needed for ghcide
1493+ haskell-lsp_0_19_0_0 = super.haskell-lsp_0_19_0_0.override {
1494+ haskell-lsp-types = self.haskell-lsp-types_0_19_0_0;
1495+ };
1496+
1497+ # this will probably need to get updated with every ghcide update,
1498+ # we need an override because ghcide is tracking haskell-lsp closely.
1499+ ghcide = dontCheck (super.ghcide.override rec {
1500+ haskell-lsp-types = self.haskell-lsp-types_0_19_0_0;
1501+ haskell-lsp = self.haskell-lsp_0_19_0_0;
1502+ });
1503+
14921504} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
pkgs/development/haskell-modules/configuration-hackage2nix.yaml+2−2
@@ -2397,6 +2397,8 @@ extra-packages:
23972397 - happy <1.19.6 # newer versions break Agda
23982398 - happy == 1.19.9 # for purescript
23992399 - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
2400+ - haskell-lsp == 0.19.* # required for ghcide 0.1.0
2401+ - haskell-lsp-types == 0.19.* # required for ghcide 0.1.0
24002402 - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
24012403 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
24022404 - hoogle == 5.0.14 # required by hie-hoogle
@@ -5072,7 +5074,6 @@ broken-packages:
50725074 - ghci-lib
50735075 - ghci-ng
50745076 - ghci-pretty
5075− - ghcide
50765077 - ghcjs-dom-jsffi
50775078 - ghcjs-fetch
50785079 - ghcjs-hplay
@@ -5871,7 +5872,6 @@ broken-packages:
58715872 - hichi
58725873 - hid-examples
58735874 - hidden-char
5874− - hie-bios
58755875 - hie-core
58765876 - hieraclus
58775877 - hierarchical-exceptions
pkgs/development/haskell-modules/configuration-nix.nix+3
@@ -727,4 +727,7 @@ self: super: builtins.intersectAttrs super {
727727 --prefix PATH : "${path}"
728728 '';
729729 });
730+
731+ # Tests access homeless-shelter.
732+ hie-bios = dontCheck super.hie-bios;
730733}