haskell.packages.ghc94.cborg: resolve duplicate overlay entry

1 files changed, 10 insertions, 9 deletions

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 f9ce2a5165aa..f6582b9e2752 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -210,13 +210,6 @@ in {
   servant-client = doJailbreak super.servant-client;
   relude = doJailbreak super.relude;
 
-  cborg = appendPatch (pkgs.fetchpatch {
-    name = "cborg-support-ghc-9.4.patch";
-    url = "https://github.com/well-typed/cborg/pull/304.diff";
-    sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8=";
-    relative = "cborg";
-  }) super.cborg;
-
   # https://github.com/tweag/ormolu/issues/941
   ormolu = doDistribute self.ormolu_0_5_3_0;
   fourmolu = overrideCabal (drv: {
@@ -240,10 +233,18 @@ in {
   # https://github.com/well-typed/cborg/pull/307
   # https://github.com/well-typed/cborg/pull/304
   # https://github.com/well-typed/cborg/issues/309#issuecomment-1471862045
-  cborg = overrideCabal rec {
+  cborg = overrideCabal (old: rec {
+    patches = old.patches or [] ++ [
+      (pkgs.fetchpatch {
+        name = "cborg-support-ghc-9.4.patch";
+        url = "https://github.com/well-typed/cborg/pull/304.diff";
+        sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8=";
+        relative = "cborg";
+      })
+    ];
     badPlatforms = lib.platforms.aarch64;
     hydraPlatforms = lib.subtractLists badPlatforms lib.platforms.all;
-  } super.cborg;
+  }) super.cborg;
   weeder = overrideCabal {
     inherit (self.cborg.meta) hydraPlatforms;
   } super.weeder;