ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 20:19:16 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #258822 from dalpd/fix-dhall-lsp-server

Browse Source 
haskellPackages.dhall-lsp-server: Apply patch relaxing lens bound
This commit is contained in:
Dennis Gosnell 2023-10-31 19:50:26 +09:00 committed by GitHub
commit 86c26177c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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: {

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -1183,7 +1183,6 @@ broken-packages:
- dhall-check # failure in job https://hydra.nixos.org/build/233206425 at 2023-09-02
- dhall-csv # failure in job https://hydra.nixos.org/build/233256049 at 2023-09-02
- dhall-fly # failure in job https://hydra.nixos.org/build/233220306 at 2023-09-02
- dhall-lsp-server # failure in job https://hydra.nixos.org/build/233216852 at 2023-09-02
- dhall-recursive-adt # failure in job https://hydra.nixos.org/build/233210665 at 2023-09-02
- dhall-text # failure in job https://hydra.nixos.org/build/233253809 at 2023-09-02
- dhall-to-cabal # failure in job https://hydra.nixos.org/build/233193270 at 2023-09-02

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -174,6 +174,7 @@ package-maintainers:
centromere:
- nfc
dalpd:
- dhall-lsp-server
- espial
- ghc-vis
- patat

2
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -85676,10 +85676,8 @@ self: {
];
description = "Language Server Protocol (LSP) server for Dhall";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
mainProgram = "dhall-lsp-server";
maintainers = [ lib.maintainers.Gabriella439 ];
broken = true;
}) {};
"dhall-nix" = callPackage