From f94cecf640664fd9dd3bbc6cc38b216a5551825a Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 23 Jun 2026 14:18:49 +0200 Subject: [PATCH] haskell.packages.ghc910.stack: remove compat code Ideally, we won't use this going forward and just build stack with GHC 9.12 --- .../configuration-ghc-9.10.x.nix | 45 ------------------- 1 file changed, 45 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 24cb5648c3ca..98800be59996 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -75,51 +75,6 @@ in # “Unfortunately we are unable to support GHC 9.10.” apply-refact = dontDistribute (markBroken super.apply-refact); - stack = - # Setup.hs depends on Cabal-syntax >= 3.14 - overrideCabal - (drv: { - setupHaskellDepends = drv.setupHaskellDepends or [ ] ++ [ - self.Cabal-syntax_3_14_2_0 - self.Cabal_3_14_2_0 - ]; - # We need to tell GHC to ignore the Cabal core libraries while - # compiling Setup.hs since it depends on Cabal >= 3.14. - # ATTN: This override assumes we are using GHC 9.10.3 since we need - # to give an exact Cabal version at the GHC (!) command line. - # FIXME(@sternenseemann): make direct argument to generic-builder.nix - env = drv.env or { } // { - setupCompileFlags = lib.concatStringsSep " " [ - "-hide-package" - "Cabal-syntax-3.12.1.0" - "-hide-package" - "Cabal-3.12.1.0" - ]; - }; - }) - - # Stack itself depends on Cabal >= 3.14 which also needs to be updated for deps - ( - super.stack.overrideScope ( - sself: ssuper: - let - upgradeCabal = - drv: - lib.pipe drv [ - (addBuildDepends [ sself.Cabal_3_14_2_0 ]) - (appendConfigureFlags [ "--constraint=Cabal>=3.14" ]) - ]; - in - { - pantry = upgradeCabal ssuper.pantry; - rio-prettyprint = upgradeCabal ssuper.rio-prettyprint; - hackage-security = upgradeCabal ssuper.hackage-security; - hpack = upgradeCabal sself.hpack_0_39_1; - stack = upgradeCabal ssuper.stack; - } - ) - ); - # # Version upgrades #