nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-15 20:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages.aeson: simplify overrides

Browse Source
This commit is contained in:
sternenseemann
2023-08-14 15:31:46 +02:00
parent 052d60c4f3
commit 892d1fbc85
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -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;