feat: Build against libpq 15
Signed-off-by: Wolfgang Walther <walther@technowledgy.de> Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
This commit is contained in:
co-authored by
Wolfgang Walther
parent
44dd73adcc
commit
c8e4f38984
+1
-1
@@ -37,7 +37,7 @@ let
|
|||||||
allOverlays.checked-shell-script
|
allOverlays.checked-shell-script
|
||||||
allOverlays.gitignore
|
allOverlays.gitignore
|
||||||
allOverlays.postgis
|
allOverlays.postgis
|
||||||
allOverlays.postgresql-default
|
(allOverlays.postgresql-default { inherit patches; })
|
||||||
allOverlays.postgresql-legacy
|
allOverlays.postgresql-legacy
|
||||||
allOverlays.postgresql-future
|
allOverlays.postgresql-future
|
||||||
(allOverlays.haskell-packages { inherit compiler; })
|
(allOverlays.haskell-packages { inherit compiler; })
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
self: super:
|
{ patches }: self: super:
|
||||||
# Overlay that sets the default version of PostgreSQL.
|
# Overlay that sets the default version of PostgreSQL.
|
||||||
|
with patches;
|
||||||
{
|
{
|
||||||
postgresql = super.postgresql_14;
|
postgresql = super.postgresql_15.overrideAttrs ({ patches ? [ ], ... }: {
|
||||||
|
patches = patches ++ [ postgresql-atexit ];
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,4 +24,6 @@
|
|||||||
./static-haskell-nix-ghc-bignum.patch;
|
./static-haskell-nix-ghc-bignum.patch;
|
||||||
static-haskell-nix-openssl =
|
static-haskell-nix-openssl =
|
||||||
./static-haskell-nix-openssl.patch;
|
./static-haskell-nix-openssl.patch;
|
||||||
|
postgresql-atexit =
|
||||||
|
./postgresql-atexit.patch;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/src/interfaces/libpq/Makefile
|
||||||
|
+++ b/src/interfaces/libpq/Makefile
|
||||||
|
@@ -118,7 +118,7 @@ backend_src = $(top_srcdir)/src/backend
|
||||||
|
libpq-refs-stamp: $(shlib)
|
||||||
|
ifneq ($(enable_coverage), yes)
|
||||||
|
ifeq (,$(filter aix solaris,$(PORTNAME)))
|
||||||
|
- @if nm -A -u $< 2>/dev/null | grep -v __cxa_atexit | grep exit; then \
|
||||||
|
+ @if nm -A -u $< 2>/dev/null | grep " exit"; then \
|
||||||
|
echo 'libpq must not be calling any function which invokes exit'; exit 1; \
|
||||||
|
fi
|
||||||
|
endif
|
||||||
@@ -35,7 +35,7 @@ let
|
|||||||
overlays =
|
overlays =
|
||||||
[
|
[
|
||||||
allOverlays.postgresql-future
|
allOverlays.postgresql-future
|
||||||
allOverlays.postgresql-default
|
(allOverlays.postgresql-default { inherit patches; })
|
||||||
(allOverlays.haskell-packages { inherit compiler extraOverrides; })
|
(allOverlays.haskell-packages { inherit compiler extraOverrides; })
|
||||||
# Disable failing tests for postgresql on musl that should have no impact
|
# Disable failing tests for postgresql on musl that should have no impact
|
||||||
# on the libpq that we need (collate.icu.utf8 and foreign regression
|
# on the libpq that we need (collate.icu.utf8 and foreign regression
|
||||||
|
|||||||
Reference in New Issue
Block a user