From 2ea0b79c15e975fa9f583ca83b6623507a5f29a9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 22 Apr 2025 01:45:35 +0200 Subject: [PATCH] haskell.packages.ghc{810,90}.ghc-tags: drop unnecessary overrides The dependency is added correctly now since ghc-tags 1.5 and GHC 9.8 don't match, causing Cabal to resolve the flag as we'd like here. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index dbd9340f3dd0..7ceefc098de7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -98,7 +98,7 @@ self: super: { ghc-api-compat = doDistribute (unmarkBroken self.ghc-api-compat_8_10_7); # Needs to use ghc-lib due to incompatible GHC - ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5); + ghc-tags = doDistribute self.ghc-tags_1_5; # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 0a7cef129cc6..e074709a19e7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -111,7 +111,7 @@ self: super: { haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version"; # Needs to use ghc-lib due to incompatible GHC - ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5); + ghc-tags = doDistribute self.ghc-tags_1_5; # ghc-lib >= 9.6 and friends no longer build with GHC 9.0 ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729;