From 2e298824d6352ad2e6d61666dbd2c75280ee5508 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 21 Jan 2024 12:14:56 +0100
Subject: [PATCH] deps: Replace postgresql-libpq fork with upstream v0.10

Our changes to reduce memory usage have been merged and released
upstream, so no need for the fork anymore.
---
 cabal.project.non-nix             |  5 -----
 nix/overlays/haskell-packages.nix | 10 +---------
 postgrest.cabal                   |  1 +
 stack.yaml                        |  5 ++---
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/cabal.project.non-nix b/cabal.project.non-nix
index 1380b64e8..e8067cb8b 100644
--- a/cabal.project.non-nix
+++ b/cabal.project.non-nix
@@ -13,8 +13,3 @@ packages: .
 --  type: git
 --  location: https://github.com/PostgREST/hasql-pool.git
 --  tag: 4d462c4d47d762effefc7de6c85eaed55f144f1d
-
-source-repository-package
-  type: git
-  location: https://github.com/PostgREST/postgresql-libpq.git
-  tag: 890a0a16cf57dd401420fdc6c7d576fb696003bc
diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix
index 01764e63a..c94db37ed 100644
--- a/nix/overlays/haskell-packages.nix
+++ b/nix/overlays/haskell-packages.nix
@@ -41,15 +41,7 @@ let
       # Marked as broken (?)
       fuzzyset = lib.markUnbroken prev.fuzzyset;
 
-      postgresql-libpq = lib.dontCheck
-        (prev.callCabal2nix "postgresql-libpq"
-          (super.fetchFromGitHub {
-            owner = "PostgREST";
-            repo = "postgresql-libpq";
-            rev = "890a0a16cf57dd401420fdc6c7d576fb696003bc"; # master
-            sha256 = "1wmyhldk0k14y8whp1p4akrkqxf5snh8qsbm7fv5f7kz95nyffd0";
-          })
-          { });
+      postgresql-libpq = lib.dontCheck prev.postgresql-libpq_0_10_0_0;
 
       hasql-pool = lib.dontCheck prev.hasql-pool_0_10;
 
diff --git a/postgrest.cabal b/postgrest.cabal
index 689ef77cd..098b598f4 100644
--- a/postgrest.cabal
+++ b/postgrest.cabal
@@ -112,6 +112,7 @@ library
                     , network-uri               >= 2.6.1 && < 2.8
                     , optparse-applicative      >= 0.13 && < 0.18
                     , parsec                    >= 3.1.11 && < 3.2
+                    , postgresql-libpq          >= 0.10
                     , protolude                 >= 0.3.1 && < 0.4
                     , regex-tdfa                >= 1.2.2 && < 1.4
                     , retry                     >= 0.7.4 && < 0.10
diff --git a/stack.yaml b/stack.yaml
index ba4ad97b4..32a0c70ae 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -11,9 +11,8 @@ nix:
 
 extra-deps:
   - configurator-pg-0.2.7
-  - git: https://github.com/PostgREST/postgresql-libpq.git
-    commit: 890a0a16cf57dd401420fdc6c7d576fb696003bc
+  - fuzzyset-0.3.1
   - hasql-notifications-0.2.0.6
   - hasql-pool-0.10
-  - fuzzyset-0.3.1
   - megaparsec-9.2.2
+  - postgresql-libpq-0.10.0.0