diff options
author | Deniz Alp Durmaz <denalp@proton.me> | 2023-10-03 08:33:45 +0300 |
---|---|---|
committer | Deniz Alp Durmaz <denalp@proton.me> | 2023-10-31 09:07:31 +0200 |
commit | 2238cc1ed9c0a61507167444799f516dda46af3d (patch) | |
tree | 0e068550a904faab9dfc42949b20065c364597d7 /pkgs/development/haskell-modules/configuration-common.nix | |
parent | d9cc84954de4ea676e32cbc6ae2a7c129616ff89 (diff) |
haskellPackages.dhall-lsp-server: Apply patch relaxing lens bound
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 27e5991f0523c..ce0ff69bdf756 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1423,13 +1423,20 @@ self: super: { # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; - # 2022-09-20: We have overridden lsp to not be the stackage version. - # dhall-lsp-server needs the older 1.4.0.0 lsp - dhall-lsp-server = super.dhall-lsp-server.override { - lsp = dontCheck (super.lsp_1_4_0_0.override { - lsp-types = super.lsp-types_1_4_0_1; - }); - }; + dhall-lsp-server = + # 2022-09-20: We have overridden lsp to not be the stackage version. + # dhall-lsp-server needs the older 1.4.0.0 lsp + let overridden-dhall-lsp-server = super.dhall-lsp-server.override { + lsp = dontCheck (super.lsp_1_4_0_0.override { + lsp-types = super.lsp-types_1_4_0_1; + }); + }; + in appendPatch (fetchpatch { + # This patch can be removed once the change question is in a tracked release. + url = "https://github.com/dhall-lang/dhall-haskell/pull/2539/commits/5dd0f0ba2d836fea3ef499c7aed04e83269c203f.patch"; + sha256 = "sha256-xjVuLDBptDGfTf7MVmPb0WuuFWRLpgDYX2ybbgjAjzs="; + relative = "dhall-lsp-server"; + }) overridden-dhall-lsp-server; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { |