From 68b6b4b7f129a76f27f94b3c805cecce92d23f3c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 9 Jun 2023 12:06:58 +0200 Subject: [PATCH] haskellPackages.aeson_2_1_2_1: apply patch for QC-2.14.3 --- .../haskell-modules/configuration-common.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aa40f5e0f62e..ec8e8ae248a7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -176,13 +176,23 @@ self: super: { }) super.math-functions; # Deal with infinite and NaN values generated by QuickCheck-2.14.3 - aeson = 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; + 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 = aesonQuickCheckPatch super.aeson; + aeson_2_1_2_1 = aesonQuickCheckPatch super.aeson_2_1_2_1; + } + ) aeson + aeson_2_1_2_1 + ; # There are numerical tests on random data, that may fail occasionally lapack = dontCheck super.lapack;