movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

haskell.packages.ghc912.generic-arbitrary: fix build

Browse source
This commit is contained in:
Wolfgang Walther 2025-04-25 20:37:28 +02:00
parent b4580cf884
commit 4b22f304b8
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
2 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
View file

@ -147,17 +147,6 @@ with haskellLib;
]; ];
}) super.doctest_0_24_0; }) super.doctest_0_24_0;
# https://github.com/typeable/generic-arbitrary/issues/18
generic-arbitrary = overrideCabal (drv: {
patches = drv.patches or [ ] ++ [
(pkgs.fetchpatch {
name = "hellwolf:fix-recursive-test-hidding-unit";
url = "https://github.com/typeable/generic-arbitrary/commit/133b80be93e6744f21e0e5ed4180a24c589f92e4.patch";
sha256 = "sha256-z9EVcD1uNAYUOVTwmCCnrEFFOvFB7lD94Y6BwGVwVRQ=";
})
];
}) super.generic-arbitrary;
# https://gitlab.haskell.org/ghc/ghc/-/issues/25930 # https://gitlab.haskell.org/ghc/ghc/-/issues/25930
generic-lens = dontCheck super.generic-lens; generic-lens = dontCheck super.generic-lens;

8
pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
View file

@ -7,8 +7,7 @@ let
inherit (pkgs) lib; inherit (pkgs) lib;
in in
self: super: self: super: {
{
llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
@ -99,8 +98,3 @@ self: super:
''; '';
} super.ghc-lib-parser; } super.ghc-lib-parser;
} }
// lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") {
# Breakage related to GHC 9.8.3 / deepseq 1.5.1.0
# https://github.com/typeable/generic-arbitrary/issues/18
generic-arbitrary = dontCheck super.generic-arbitrary;
}