diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix index b57ed1cd..94835e04 100644 --- a/nix/overlays/haskell-packages.nix +++ b/nix/overlays/haskell-packages.nix @@ -332,7 +332,7 @@ in { owner = "awakesecurity"; repo = "proto3-wire"; rev = "2a8e434b1b7686a26c9848cc6906c07389658a04"; # 1.4.4 - sha256 = "fGPcpv1AFLbmEg9ZRiBbto3el49pHfPIIxQT6U2mebp="; + sha256 = "92dcADQg7bSD3zGPfLXzyHQndGMKRTFLPt0Pei2ZTws="; }; in pkgsNew.haskell.lib.doJailbreak diff --git a/proto3-suite.cabal b/proto3-suite.cabal index bf81170d..416012c9 100644 --- a/proto3-suite.cabal +++ b/proto3-suite.cabal @@ -133,7 +133,7 @@ library safe ==0.3.*, split, system-filepath, - template-haskell >=2.17 && <2.22, + template-haskell >=2.17 && <2.23, text >= 0.2 && <2.2, text-short >=0.1.3 && <0.2, time, diff --git a/src/Proto3/Suite/DotProto/Generate/Syntax.hs b/src/Proto3/Suite/DotProto/Generate/Syntax.hs index f4a4353c..6eb5d6fc 100644 --- a/src/Proto3/Suite/DotProto/Generate/Syntax.hs +++ b/src/Proto3/Suite/DotProto/Generate/Syntax.hs @@ -784,7 +784,12 @@ closedTyFamDecl_ tyFamName famBndrs resultKind eqns = #else eqnBndrs #endif - , feqn_pats = map HsValArg pats + , feqn_pats = map + (HsValArg +#if MIN_VERSION_ghc(9,10,0) + synDef +#endif + ) pats , feqn_fixity = Prefix , feqn_rhs = rhs } @@ -810,7 +815,12 @@ tyFamInstDecl_ tyFamName bndrs pats rhs = noLocA $ GHC.InstD NoExtField TyFamIns #else bndrs #endif - , feqn_pats = map HsValArg pats + , feqn_pats = map + (HsValArg +#if MIN_VERSION_ghc(9,10,0) + synDef +#endif + ) pats , feqn_fixity = Prefix , feqn_rhs = rhs }