From 3f55059bbd5abd37c1184bf855f33e905cfd681a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 17 Oct 2024 15:46:53 +0200 Subject: [PATCH] haskellPackages.haddock-library_1_7_0: remove at 1.7.0 stylish-cabal does no longer build for GHC 8.6.5 (binary) for unrelated reasons. Doesn't really make sense to invest further into it. --- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 ---- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 - 2 files changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index cadef334c5ed..6fd85c971e23 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -86,10 +86,6 @@ self: super: { # cabal2spec needs a recent version of Cabal cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); - # https://github.com/pikajude/stylish-cabal/issues/12 - stylish-cabal = doDistribute (markUnbroken (super.stylish-cabal.override { haddock-library = self.haddock-library_1_7_0; })); - haddock-library_1_7_0 = dontCheck super.haddock-library_1_7_0; - # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bd60eb375d44..e7c6f672ad6f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -62,7 +62,6 @@ extra-packages: - ghc-lib-parser == 9.8.* # 2024-05-19: preserve for GHC 9.8 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0 - ghc-lib-parser-ex == 9.8.* # 2024-05-19: preserve for GHC 9.8 - - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs - hashable == 1.4.7.0 # allows GHC 9.10 - ansi-wl-pprint >= 0.6 && < 0.7 # 2024-03-23: required for ghcjs