Skip to content

Commit

Permalink
deps: Replace postgresql-libpq fork with upstream v0.10
Browse files Browse the repository at this point in the history
Our changes to reduce memory usage have been merged and released
upstream, so no need for the fork anymore.
  • Loading branch information
wolfgangwalther committed Jan 21, 2024
1 parent 7a387c7 commit 54f7865
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 17 deletions.
5 changes: 0 additions & 5 deletions cabal.project.non-nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 1 addition & 9 deletions nix/overlays/haskell-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 2 additions & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 54f7865

Please sign in to comment.