diff --git a/configuration/common.nix b/configuration/common.nix index 690f8aa428bccf5b873d02a20d28dbd47a82f430..c5c6d7d76eabf8e373043f939254c91fb5702db4 100644 --- a/configuration/common.nix +++ b/configuration/common.nix @@ -15,6 +15,15 @@ final: prev: { ]; }); + hasql-th = overrideCabal + prev.hasql-th + (_: + { + patches = [ + ./patches/hasql-th-01.patch + ]; + }); + hasql-transaction = overrideCabal prev.hasql-transaction (_: diff --git a/configuration/patches/hasql-th-01.patch b/configuration/patches/hasql-th-01.patch new file mode 100644 index 0000000000000000000000000000000000000000..deb6803c8a67287605a3695988a0bf6da85f3119 --- /dev/null +++ b/configuration/patches/hasql-th-01.patch @@ -0,0 +1,19 @@ +commit e724581275f1dd3a673ccbff1b32f458b5b4589f +Author: Daniel Firth <dan.firth@homotopic.tech> +Date: Sun Dec 3 09:31:56 2023 +0000 + + hide unzip + +diff --git a/library/Hasql/TH/Prelude.hs b/library/Hasql/TH/Prelude.hs +index 60d73db..d01d39e 100644 +--- a/library/Hasql/TH/Prelude.hs ++++ b/library/Hasql/TH/Prelude.hs +@@ -29,7 +29,7 @@ import Data.Either as Exports + import Data.Fixed as Exports + import Data.Foldable as Exports + import Data.Function as Exports hiding (id, (.)) +-import Data.Functor as Exports ++import Data.Functor as Exports hiding (unzip) + import Data.Functor.Contravariant as Exports + import Data.Functor.Contravariant.Divisible as Exports + import Data.Functor.Identity as Exports