diff options
author | Rodney Lorrimar <dev@rodney.id.au> | 2024-02-28 13:56:43 +0800 |
---|---|---|
committer | Rodney Lorrimar <dev@rodney.id.au> | 2024-02-28 14:22:59 +0800 |
commit | 9a38f36b7e478e6009a885d1407e28feb56fa501 (patch) | |
tree | 3f46bb2f99140b166e292cab33b827db7f1a0e22 /pkgs | |
parent | f3c1e18cf356462186d1f4007907c336822189f4 (diff) | |
download | nixlib-9a38f36b7e478e6009a885d1407e28feb56fa501.tar nixlib-9a38f36b7e478e6009a885d1407e28feb56fa501.tar.gz nixlib-9a38f36b7e478e6009a885d1407e28feb56fa501.tar.bz2 nixlib-9a38f36b7e478e6009a885d1407e28feb56fa501.tar.lz nixlib-9a38f36b7e478e6009a885d1407e28feb56fa501.tar.xz nixlib-9a38f36b7e478e6009a885d1407e28feb56fa501.tar.zst nixlib-9a38f36b7e478e6009a885d1407e28feb56fa501.zip |
haskellPackages.dhall-lsp-server: use latest revision from git
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 40 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml | 4 |
2 files changed, 28 insertions, 16 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f37f3e424228..7ad83affa8a6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1521,20 +1521,32 @@ self: super: { # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; - 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; + + # 2024-02-28: The Hackage version dhall-lsp-server-1.1.3 requires + # lsp-1.4.0.0 which is hard to build with this LTS. However, the latest + # git version of dhall-lsp-server works with lsp-2.1.0.0, and only + # needs jailbreaking to build successfully. + dhall-lsp-server = lib.pipe + (super.dhall-lsp-server.overrideScope (lself: lsuper: { + lsp = doJailbreak lself.lsp_2_1_0_0; # sorted-list <0.2.2 + lsp-types = lself.lsp-types_2_0_2_0; + })) + [ + # Use latest main branch version of dhall-lsp-server. + (assert super.dhall-lsp-server.version == "1.1.3"; overrideSrc { + version = "unstable-2024-02-19"; + src = pkgs.fetchFromGitHub { + owner = "dhall-lang"; + repo = "dhall-haskell"; + rev = "277d8b1b3637ba2ce125783cc1936dc9591e67a7"; + hash = "sha256-YvL3XEltU9sdU45ULHeD3j1mPGZoO1J81MW7f2+10ok="; + } + "/dhall-lsp-server"; + }) + # New version needs an extra dependency + (addBuildDepend self.text-rope) + # bounds too strict: mtl <2.3, transformers <0.6 + doJailbreak + ]; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 79d9798e0f46..5907ddbb9971 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -93,8 +93,8 @@ extra-packages: - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript - lens-aeson < 1.2 # 2022-12-17: For aeson < 2.0 compat - - lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2 - - lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2 + - lsp == 2.1.0.0 # 2024-02-28: need for dhall-lsp-server unstable + - lsp-types == 2.0.2.0 # 2024-02-28: need for dhall-lsp-server unstable - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 |