movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 20:25:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

haskellPackages.cborg: fix build on 32-bit platforms

Browse source 
Otherwise we can't build pandoc (pandoc -> tls -> serialise -> cborg).

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
This commit is contained in:
K900 2025-04-30 19:56:07 +03:00 • committed by sternenseemann
parent aa041a5a6d
commit 423ea6a07c
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -2602,7 +2602,28 @@ self: super:
# Overly strict bounds on tasty-quickcheck (test suite) (< 0.11)
hashable = doJailbreak super.hashable;
# https://github.com/well-typed/cborg/issues/340
cborg = doJailbreak super.cborg;
cborg = lib.pipe super.cborg [
doJailbreak
# Fix build on 32-bit: https://github.com/well-typed/cborg/pull/322
(appendPatches (
lib.optionals pkgs.stdenv.hostPlatform.is32bit [
(pkgs.fetchpatch {
name = "cborg-i686-1.patch";
url = "https://github.com/well-typed/cborg/commit/a4757c46219afe6d235652ae642786f2e2977020.patch";
sha256 = "01n0x2l605x7in9hriz9asmzsfb5f8d6zkwgypckfj1r18qbs2hj";
includes = [ "**/Codec/CBOR/**" ];
stripLen = 1;
})
(pkgs.fetchpatch {
name = "cborg-i686-2.patch";
url = "https://github.com/well-typed/cborg/commit/94a856e4e544a5bc7f927cfb728de385d6260af4.patch";
sha256 = "03iz85gsll38q5bl3m024iv7yb1k5sisly7jvgf66zic8fbvkhcn";
includes = [ "**/Codec/CBOR/**" ];
stripLen = 1;
})
]
))
];
# Doesn't compile with tasty-quickcheck == 0.11 (see issue above)
serialise = dontCheck super.serialise;
# https://github.com/Bodigrim/data-array-byte/issues/1