From 0c5bc7680f5699b3e95cbba6ae2ff04a0f163c0e Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@horizon-haskell.net>
Date: Sun, 3 Dec 2023 09:31:15 +0000
Subject: [PATCH] postgresql-syntax: patch
---
configuration/common.nix | 11 +++++--
.../patches/postgresql-syntax-01.patch | 32 +++++++++++++++++++
2 files changed, 40 insertions(+), 3 deletions(-)
create mode 100644 configuration/patches/postgresql-syntax-01.patch
diff --git a/configuration/common.nix b/configuration/common.nix
index 259dae13..690f8aa4 100644
--- a/configuration/common.nix
+++ b/configuration/common.nix
@@ -43,9 +43,6 @@ final: prev: {
];
});
-
-
-
libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; };
linear-generics = overrideCabal
@@ -58,6 +55,14 @@ final: prev: {
];
});
+ postgresql-syntax = overrideCabal
+ prev.postgresql-syntax
+ (_:
+ {
+ patches = [
+ ./patches/postgresql-syntax-01.patch
+ ];
+ });
saltine = addPkgconfigDepend prev.saltine pkgs.libsodium;
diff --git a/configuration/patches/postgresql-syntax-01.patch b/configuration/patches/postgresql-syntax-01.patch
new file mode 100644
index 00000000..4f81a4f6
--- /dev/null
+++ b/configuration/patches/postgresql-syntax-01.patch
@@ -0,0 +1,32 @@
+commit ece56da3079d80e69fece7e05a5540fd4858a98c
+Author: Daniel Firth <dan.firth@homotopic.tech>
+Date: Sun Dec 3 09:22:44 2023 +0000
+
+ hide unzip and unsnoc
+
+diff --git a/library/PostgresqlSyntax/Extras/NonEmpty.hs b/library/PostgresqlSyntax/Extras/NonEmpty.hs
+index 7d9ecd1..d0cd890 100644
+--- a/library/PostgresqlSyntax/Extras/NonEmpty.hs
++++ b/library/PostgresqlSyntax/Extras/NonEmpty.hs
+@@ -1,7 +1,7 @@
+ module PostgresqlSyntax.Extras.NonEmpty where
+
+ import Data.List.NonEmpty
+-import PostgresqlSyntax.Prelude hiding (cons, fromList, head, init, last, reverse, tail, uncons)
++import PostgresqlSyntax.Prelude hiding (cons, fromList, head, init, last, reverse, tail, uncons, unsnoc)
+
+ -- |
+ -- >>> intersperseFoldMap ", " id (fromList ["a"])
+diff --git a/library/PostgresqlSyntax/Prelude.hs b/library/PostgresqlSyntax/Prelude.hs
+index c16ee7a..9fe2596 100644
+--- a/library/PostgresqlSyntax/Prelude.hs
++++ b/library/PostgresqlSyntax/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.Identity as Exports
+ import Data.HashMap.Strict as Exports (HashMap)
+ import Data.HashSet as Exports (HashSet)
--
GitLab