From c4f8cd1a4498e9803ef00b77ba9a6ea8e7884a4a Mon Sep 17 00:00:00 2001 From: Eldritch Cookie Date: Tue, 27 Aug 2024 11:02:28 -0300 Subject: [PATCH] haskell.packages.ghc910.haskell-language-server: fix package --- .../haskell-modules/configuration-ghc-9.10.x.nix | 13 ++++++++++--- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 13 +++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index a41e2cebc2bf5..0dd47690b4dc2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -68,11 +68,14 @@ self: super: { apply-refact = doDistribute self.apply-refact_0_14_0_0; attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; extensions = doDistribute self.extensions_0_1_0_2; + fourmolu = doDistribute self.fourmolu_0_16_2_0; hashable = doDistribute self.hashable_1_4_7_0; integer-conversion = doDistribute self.integer-conversion_0_1_1; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; + ormolu = doDistribute self.ormolu_0_7_7_0; primitive = doDistribute (dontCheck self.primitive_0_9_0_0); # tests introduce a recursive dependency via hspec quickcheck-instances = doDistribute self.quickcheck-instances_0_3_31; rebase = doDistribute self.rebase_1_21_1; @@ -83,15 +86,15 @@ self: super: { uuid-types = doDistribute self.uuid-types_1_0_6; # A given major version of ghc-exactprint only supports one version of GHC. - ghc-exactprint = doDistribute self.ghc-exactprint_1_10_0_0; - ghc-exactprint_1_10_0_0 = addBuildDepends [ + ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; + ghc-exactprint_1_9_0_0 = addBuildDepends [ self.Diff self.extra self.ghc-paths self.silently self.syb self.HUnit - ] super.ghc-exactprint_1_10_0_0; + ] super.ghc-exactprint_1_9_0_0; # # Jailbreaks @@ -120,4 +123,8 @@ self: super: { lukko_0_1_2 = dontCheck super.lukko_0_1_2; # doesn't compile with tasty ==1.4.* resolv = dontCheck super.resolv; # doesn't compile with filepath ==1.5.* primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* + + haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;}))); + + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bac7d621854b9..cb0e9538c9017 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -66,6 +66,7 @@ extra-packages: - ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2 - ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4 - ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8 + - ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 - ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8c71a28fcfddb..917fa6657031d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -120625,6 +120625,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-exactprint_1_9_0_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.9.0.0"; + sha256 = "195y3yy7bjrx3b21nqrhxrnbxidaydb9g28i37wqx5glv8y65v51"; + isLibrary = true; + isExecutable = true; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-exactprint_1_10_0_0" = callPackage ({ mkDerivation }: mkDerivation {