diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b5b304c4fa0..9961e3b79e98 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1489,4 +1489,16 @@ self: super: { 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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 90f168780208..5104ce630ed2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2397,6 +2397,8 @@ extra-packages: - happy <1.19.6 # newer versions break Agda - happy == 1.19.9 # for purescript - 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 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hoogle == 5.0.14 # required by hie-hoogle @@ -5072,7 +5074,6 @@ broken-packages: - ghci-lib - ghci-ng - ghci-pretty - - ghcide - ghcjs-dom-jsffi - ghcjs-fetch - ghcjs-hplay @@ -5871,7 +5872,6 @@ broken-packages: - hichi - hid-examples - hidden-char - - hie-bios - hie-core - hieraclus - hierarchical-exceptions diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 78e44a5ec87b..e05f82bf04d4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -727,4 +727,7 @@ self: super: builtins.intersectAttrs super { --prefix PATH : "${path}" ''; }); + + # Tests access homeless-shelter. + hie-bios = dontCheck super.hie-bios; }