From 892d1fbc85a0ae1d166b2f55f830495ca87dc99a Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Aug 2023 15:31:46 +0200
Subject: [PATCH] haskellPackages.aeson: simplify overrides

---
 .../haskell-modules/configuration-common.nix  | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e951e0a08ce5..7f88ab8629d3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -184,25 +184,17 @@ self: super: {
   }) super.math-functions;
 
   # Deal with infinite and NaN values generated by QuickCheck-2.14.3
-  inherit (
-    let
-      aesonQuickCheckPatch = appendPatches [
-        (pkgs.fetchpatch {
-          name = "aeson-quickcheck-2.14.3-double-workaround.patch";
-          url = "https://github.com/haskell/aeson/commit/58766a1916b4980792763bab74f0c86e2a7ebf20.patch";
-          sha256 = "1jk2xyi9g6dfjsi6hvpvkpmag3ivimipwy1izpbidf3wvc9cixs3";
-        })
-      ];
-    in
-    {
-      aeson = overrideCabal {
-        # aeson's test suite includes some tests with big numbers that fail on 32bit
-        # https://github.com/haskell/aeson/issues/1060
-        doCheck = !pkgs.stdenv.hostPlatform.is32bit;
-      } (aesonQuickCheckPatch super.aeson);
-    }
-  ) aeson
-    ;
+  aeson = overrideCabal {
+    # aeson's test suite includes some tests with big numbers that fail on 32bit
+    # https://github.com/haskell/aeson/issues/1060
+    doCheck = !pkgs.stdenv.hostPlatform.is32bit;
+  } (appendPatches [
+    (pkgs.fetchpatch {
+      name = "aeson-quickcheck-2.14.3-double-workaround.patch";
+      url = "https://github.com/haskell/aeson/commit/58766a1916b4980792763bab74f0c86e2a7ebf20.patch";
+      sha256 = "1jk2xyi9g6dfjsi6hvpvkpmag3ivimipwy1izpbidf3wvc9cixs3";
+    })
+  ] super.aeson);
 
   # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149
   orbits = dontCheck super.orbits;