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

haskellPackages.optics: pick patches that make test suite pass with 9.12

Browse Source 
I'm not 100% clear whether there is still some kind of GHC regression
involved here, but I think we can pick these patches from upstream's
development branch. Also GHC upstream is aware of these (original)
failures with 9.12.5-rc2.
This commit is contained in:
sterni
2026-06-27 13:43:24 +02:00
committed by Wolfgang Walther
parent 8b99224c3e
commit 4132fb9736
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1141,12 +1141,33 @@ with haskellLib;
tailfile-hinotify = doJailbreak (dontCheck super.tailfile-hinotify);
# 2025-09-01: Merged patch from upstream to fix bounds:
optics = appendPatch (fetchpatch {
name = "optics-fix-inspection-testing-bound";
url = "https://github.com/well-typed/optics/commit/d16b1ac5476c89cc94fb108fe1be268791affca6.patch";
sha256 = "sha256-w0L/EXSWRQkCkFnvXYel0BNgQQhxn6zATkD3GZS5gz8=";
relative = "optics";
}) super.optics;
optics = appendPatches [
(fetchpatch {
name = "optics-fix-inspection-testing-bound";
url = "https://github.com/well-typed/optics/commit/d16b1ac5476c89cc94fb108fe1be268791affca6.patch";
sha256 = "sha256-w0L/EXSWRQkCkFnvXYel0BNgQQhxn6zATkD3GZS5gz8=";
relative = "optics";
})
# Test suite changes from development branch which make it pass with GHC == 9.12.*
(fetchpatch {
name = "optics-inspection-testing-lower-bound.patch";
url = "https://github.com/well-typed/optics/commit/121554907e4216c4a88323d441c7c11f19016062.patch";
hash = "sha256-L7HEK3l7lGvu1Rp8ygkQEZFnJW9R+dgaYGz4c7zVYiE=";
relative = "optics";
})
(fetchpatch {
name = "optics-inspection-testing-ghc-9.12-changes.patch";
url = "https://github.com/well-typed/optics/commit/aa3cf444b881b7e19a6a9764bcc0462c9ab00724.patch";
hash = "sha256-n2hnZXJV3fjRbHTRaM/eabTyS61T/+4mSU4AZBsEEkM=";
relative = "optics";
})
(fetchpatch {
name = "optics-inspection-ghc-9.12-skips.patch";
url = "https://github.com/well-typed/optics/commit/397fcf242257a7e3553b845e48d4531015f0478d.patch";
hash = "sha256-r/NPdUckh37Ed9gA7OXmDdZmMp3zjuGCB+0P8/Ce4i4=";
relative = "optics";
})
] super.optics;
# 2025-02-10: Too strict bounds on text < 2.1
digestive-functors-blaze = doJailbreak super.digestive-functors-blaze;