Skip to content
Snippets Groups Projects
Commit 0c5bc768 authored by Daniel Firth's avatar Daniel Firth
Browse files

postgresql-syntax: patch

parent 2b02d4e8
No related merge requests found
...@@ -43,9 +43,6 @@ final: prev: { ...@@ -43,9 +43,6 @@ final: prev: {
]; ];
}); });
libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; }; libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; };
linear-generics = overrideCabal linear-generics = overrideCabal
...@@ -58,6 +55,14 @@ final: prev: { ...@@ -58,6 +55,14 @@ final: prev: {
]; ];
}); });
postgresql-syntax = overrideCabal
prev.postgresql-syntax
(_:
{
patches = [
./patches/postgresql-syntax-01.patch
];
});
saltine = addPkgconfigDepend prev.saltine pkgs.libsodium; saltine = addPkgconfigDepend prev.saltine pkgs.libsodium;
......
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)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment