about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
diff options
context:
space:
mode:
authorRodney Lorrimar <dev@rodney.id.au>2023-07-25 17:08:43 +0800
committerRodney Lorrimar <dev@rodney.id.au>2023-07-25 17:08:43 +0800
commite45b99dfb50a6ca3a62ed3c3048bfda2fae453e0 (patch)
tree31d9ff7866c1371c82bf0f0f22915c1accaddf2b /pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
parent5efd81070c9e98883f614327574854faf2bc38f6 (diff)
downloadnixlib-e45b99dfb50a6ca3a62ed3c3048bfda2fae453e0.tar
nixlib-e45b99dfb50a6ca3a62ed3c3048bfda2fae453e0.tar.gz
nixlib-e45b99dfb50a6ca3a62ed3c3048bfda2fae453e0.tar.bz2
nixlib-e45b99dfb50a6ca3a62ed3c3048bfda2fae453e0.tar.lz
nixlib-e45b99dfb50a6ca3a62ed3c3048bfda2fae453e0.tar.xz
nixlib-e45b99dfb50a6ca3a62ed3c3048bfda2fae453e0.tar.zst
nixlib-e45b99dfb50a6ca3a62ed3c3048bfda2fae453e0.zip
haskell.packages.ghc94.hnix: Add patch to fix compile errors
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
index 1f962271861c..da3c50a60406 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -63,6 +63,8 @@ in {
 
   hashable-time = doJailbreak super.hashable-time;
   libmpd = doJailbreak super.libmpd;
+  lens-family-th = doJailbreak super.lens-family-th;  # template-haskell <2.19
+
   # generically needs base-orphans for 9.4 only
   base-orphans = dontCheck (doDistribute super.base-orphans);
 
@@ -70,6 +72,11 @@ in {
   # https://gitlab.haskell.org/ghc/ghc/-/issues/21619
   hedgehog = dontHaddock super.hedgehog;
 
+  # Cherry-pick GHC 9.4 changes from hnix master branch
+  hnix = appendPatches [
+    ./patches/hnix-compat-for-ghc-9.4.patch
+  ] (doJailbreak super.hnix);
+
   hpack = overrideCabal (drv: {
     # Cabal 3.6 seems to preserve comments when reading, which makes this test fail
     # 2021-10-10: 9.2.1 is not yet supported (also no issue)