diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 532f80840fc7..ce10e49f603c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1736,32 +1736,22 @@ with haskellLib; # https://github.com/NixOS/nixpkgs/issues/198495 (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql); - dhall-lsp-server = - appendPatches - [ - # Add support for lsp >= 2.7 - (pkgs.fetchpatch { - name = "dhall-lsp-server-lsp-2.7.patch"; - url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch"; - sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY="; - relative = "dhall-lsp-server"; - }) - # Fix build with text >= 2.1.2 - (pkgs.fetchpatch { - name = "dhall-lsp-server-text-2.1.2.patch"; - url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch"; - hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA="; - relative = "dhall-lsp-server"; - }) - ] - ( - overrideCabal (drv: { - prePatch = '' - ${drv.prePatch or ""} - ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal - ''; - }) super.dhall-lsp-server - ); + dhall-lsp-server = appendPatches [ + # Add support for lsp >= 2.7 + (pkgs.fetchpatch { + name = "dhall-lsp-server-lsp-2.7.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch"; + sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY="; + relative = "dhall-lsp-server"; + }) + # Fix build with text >= 2.1.2 + (pkgs.fetchpatch { + name = "dhall-lsp-server-text-2.1.2.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch"; + hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA="; + relative = "dhall-lsp-server"; + }) + ] super.dhall-lsp-server; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom-core = lib.pipe super.reflex-dom-core [