From a3d0b08f7551e9549eaa8c035c1f51e3d3cd32e1 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 22 Apr 2025 01:49:56 +0200
Subject: [PATCH] haskell.packages.ghc9{2,4}.ghc-tags: match ghc-lib (!)
 version (9.6)

---
 .../configuration-ghc-9.2.x.nix               |  4 +-
 .../configuration-ghc-9.4.x.nix               |  2 +-
 .../configuration-hackage2nix/main.yaml       |  1 -
 .../haskell-modules/hackage-packages.nix      | 59 -------------------
 4 files changed, 3 insertions(+), 63 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
index d3263031ad0a..6d85d85a8617 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@@ -94,8 +94,8 @@ self: super: {
   # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html
   language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0;
 
-  # Needs to match ghc version
-  ghc-tags = doDistribute self.ghc-tags_1_5;
+  # Needs to match ghc-lib version
+  ghc-tags = doDistribute (doJailbreak self.ghc-tags_1_7);
 
   # Needs to match ghc-lib
   hlint = doDistribute self.hlint_3_6_1;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
index 5913e29bbebc..34972d8151b8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -101,7 +101,7 @@ in
   # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260
   ghc-check = dontHaddock super.ghc-check;
 
-  ghc-tags = self.ghc-tags_1_6;
+  ghc-tags = doDistribute (doJailbreak self.ghc-tags_1_7); # aeson < 2.2
 
   # ghc-lib >= 9.8 and friends no longer build with GHC 9.4 since they require semaphore-compat
   ghc-lib-parser = doDistribute (
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index d8e09d4f5bed..79a04e029270 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -77,7 +77,6 @@ extra-packages:
   - ghc-lib-parser-ex == 9.10.*         # 2024-12-26: preserve for 9.10 HLS
   - ghc-source-gen < 0.4.6.0            # 2024-12-31: support GHC < 9.0
   - ghc-tags == 1.5.*                   # 2023-02-18: preserve for ghc-lib == 9.2.*
-  - ghc-tags == 1.6.*                   # 2023-02-18: preserve for ghc-lib == 9.4.*
   - ghc-tags == 1.7.*                   # 2023-02-18: preserve for ghc-lib == 9.6.*
   - ghc-tags == 1.8.*                   # 2023-02-18: preserve for ghc-lib == 9.8.*
   - happy == 1.19.12                    # for ghcjs
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 20dffde12e5d..5a54ed6a12e3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -258409,65 +258409,6 @@ self: {
     }
   ) { };
 
-  "ghc-tags_1_6" = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      async,
-      attoparsec,
-      base,
-      bytestring,
-      containers,
-      deepseq,
-      directory,
-      filepath,
-      ghc-lib,
-      ghc-paths,
-      optparse-applicative,
-      process,
-      stm,
-      temporary,
-      text,
-      time,
-      vector,
-      yaml,
-    }:
-    mkDerivation {
-      pname = "ghc-tags";
-      version = "1.6";
-      sha256 = "0iiqapx4v4jz4d7ni4dcvpfl948ydx2a7kxvjsk2irdcknzymblw";
-      revision = "1";
-      editedCabalFile = "1piwibafkgq2z6h36jpiszs8bzg6xqz954g6b2dr93gfya0qh5jv";
-      isLibrary = false;
-      isExecutable = true;
-      executableHaskellDepends = [
-        aeson
-        async
-        attoparsec
-        base
-        bytestring
-        containers
-        deepseq
-        directory
-        filepath
-        ghc-lib
-        ghc-paths
-        optparse-applicative
-        process
-        stm
-        temporary
-        text
-        time
-        vector
-        yaml
-      ];
-      description = "Utility for generating ctags and etags with GHC API";
-      license = lib.licenses.mpl20;
-      hydraPlatforms = lib.platforms.none;
-      mainProgram = "ghc-tags";
-    }
-  ) { };
-
   "ghc-tags_1_7" = callPackage (
     {
       mkDerivation,