b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #206842 from sternenseemann/bloomfilter-ghc-9.2

Browse source 
haskellPackages.bloomfilter: patch for GHC >= 9.2
This commit is contained in:
Dennis Gosnell 2022-12-21 21:26:33 +09:00 committed by GitHub
parent 0e05d68e5b 4a6483eace
commit 39bf05b42e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "14391vj0awvkpsd32kanmc85yic5mg4pxmjhiv7wjxy7ga13wfqw";
sha256 = "052ld021yvjbnx1sbj1ryflsyn0v1y1ygx1zv0ql6fk3cysw5lxf";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash
@ -598,8 +598,24 @@ self: super: {
# https://github.com/basvandijk/concurrent-extra/issues/12
concurrent-extra = dontCheck super.concurrent-extra;
# https://github.com/bos/bloomfilter/issues/7
bloomfilter = appendPatch ./patches/bloomfilter-fix-on-32bit.patch super.bloomfilter;
bloomfilter = appendPatches [
# https://github.com/bos/bloomfilter/issues/7
./patches/bloomfilter-fix-on-32bit.patch
# Fix build with GHC >= 9.2 by using stock unsafeShift* functions
# https://github.com/bos/bloomfilter/pull/20
(pkgs.fetchpatch {
name = "bloomfilter-ghc-9.2-shift.patch";
url = "https://github.com/bos/bloomfilter/pull/20/commits/fb79b39c44404fd791a3bed973e9d844fb084f1e.patch";
sha256 = "0clmr5iar4mhp8nbgh1c1rh4fl7dy0g2kbqqh0af8aqmhjpqzrq3";
})
] (overrideCabal (drv: {
# Make sure GHC 9.2 patch applies correctly
revision = null;
editedCabalFile = null;
prePatch = drv.prePatch or "" + ''
"${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
'';
}) super.bloomfilter);
# https://github.com/pxqr/base32-bytestring/issues/4
base32-bytestring = dontCheck super.base32-bytestring;