diff options
| author | maralorn <malte.brandy@maralorn.de> | 2020-09-04 02:58:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 02:58:04 +0200 |
| commit | 037e178a437d56e6f41406cdac679ae75f72a83f (patch) | |
| tree | f91e1a89c2a60f7db9b2e89d007fee6f85cc0f23 /pkgs/development/haskell-modules | |
| parent | cca4dcd2b7e53df28c56aded71a566e48c9697fc (diff) | |
haskellPackages.ghcide: Fix build (#97052)
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e28107d5ae419..bcb849732f8b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1209,7 +1209,15 @@ self: super: { # 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 { ghc-check = self.ghc-check_0_3_0_1; }); + ghcide = dontCheck (appendPatch (super.ghcide.override { + hie-bios = dontCheck super.hie-bios_0_7_1; + lsp-test = dontCheck self.lsp-test_0_11_0_4; + }) (pkgs.fetchpatch { + # This patch loosens the hie-bios upper bound. + # It is already merged into upstream and won‘t be needed for ghcide 0.4.0 + url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch"; + sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz"; + })); # hasn‘t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a653e559701d5..831fd242cc13b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2563,7 +2563,6 @@ extra-packages: - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - doctemplates == 0.8 # required by pandoc-2.9.x - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - - ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - gi-gdk == 3.0.23 # required for gi-pango 1.0.23 - gi-gtk == 3.0.35 # required for gi-pango 1.0.23 @@ -2575,8 +2574,6 @@ 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.22.* # required for ghcide 0.2.0 - - haskell-lsp-types == 0.22.* # required for ghcide 0.2.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 |