Unverified Commit 6c1a3aea authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

haskell.packages.ghc984.haskell-language-server: fix build 

ghcide and lsp-types need the same overlay to have a single consistent
regex-tdfa in the closure.

Doing the same for GHC 9.6.7 for consistency, even though the build
passed there, so far.
parent e2cf8f69

pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix

+4 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ in 
        apply-refact = addBuildDepend self.data-default-class super.apply-refact;

        floskell = doJailbreak super.floskell;

        fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0);

        ghcide = super.ghcide;

        haskell-language-server = addBuildDepends [

          self.retrie

          self.floskell
@@ -224,6 +225,7 @@ in 
        ] super.haskell-language-server;

        hls-plugin-api = super.hls-plugin-api;

        hlint = self.hlint_3_8;

        lsp-types = super.lsp-types;

        ormolu = self.ormolu_0_7_4_0;

        retrie = doJailbreak (unmarkBroken super.retrie);

        stylish-haskell = self.stylish-haskell_0_14_6_0;
@@ -232,9 +234,11 @@ in 
    apply-refact

    floskell

    fourmolu

    ghcide

    haskell-language-server

    hls-plugin-api

    hlint

    lsp-types

    ormolu

    retrie

    stylish-haskell

pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ in 
        apply-refact = addBuildDepend self.data-default-class super.apply-refact;

        floskell = doJailbreak super.floskell;

        fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0);

        ghcide = super.ghcide;

        haskell-language-server = addBuildDepends [

          self.retrie

          self.floskell
@@ -128,6 +129,7 @@ in 
        ] super.haskell-language-server;

        hls-plugin-api = super.hls-plugin-api;

        hlint = self.hlint_3_8;

        lsp-types = super.lsp-types;

        ormolu = self.ormolu_0_7_4_0;

        retrie = doJailbreak (unmarkBroken super.retrie);

        stylish-haskell = self.stylish-haskell_0_14_6_0;
@@ -136,9 +138,11 @@ in 
    apply-refact

    floskell

    fourmolu

    ghcide

    haskell-language-server

    hls-plugin-api

    hlint

    lsp-types

    ormolu

    retrie

    stylish-haskell