From 76f6b2d6755e6b702d1d3dbc17c0d5a23003d8b4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 1 Feb 2025 10:24:55 +0100 Subject: [PATCH 1/3] postgresqlPackages.apache_datasketches: fix build --- pkgs/servers/sql/postgresql/ext/apache_datasketches.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index 3e6c625c60fe..25c06e6c038c 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -3,7 +3,7 @@ lib, fetchFromGitHub, postgresql, - boost, + boost186, postgresqlTestExtension, buildPostgresqlExtension, }: @@ -39,7 +39,8 @@ buildPostgresqlExtension (finalAttrs: { sourceRoot = main_src.name; - buildInputs = [ boost ]; + # fails to build with boost 1.87 + buildInputs = [ boost186 ]; patchPhase = '' runHook prePatch From 70de1c0104d33b12457209179e99c11dd6c4126a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 1 Feb 2025 10:55:13 +0100 Subject: [PATCH 2/3] postgresqlPackages.{pg_ed25519,smlar}: mark as broken for v16 and v17 Not sure why non-clang linux was not marken as broken, but it certainly breaks the same way as the other cases. --- pkgs/servers/sql/postgresql/ext/pg_ed25519.nix | 5 +++-- pkgs/servers/sql/postgresql/ext/smlar.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index fc64df1db499..6e823f82b560 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -9,6 +9,7 @@ buildPostgresqlExtension rec { pname = "pg_ed25519"; version = "0.2"; + src = fetchFromGitLab { owner = "dwagin"; repo = "pg_ed25519"; @@ -22,7 +23,7 @@ buildPostgresqlExtension rec { maintainers = [ maintainers.renzo ]; platforms = postgresql.meta.platforms; license = licenses.mit; - # Broken on darwin and linux (JIT) with no upstream fix available. - broken = lib.versionAtLeast postgresql.version "16" && stdenv.cc.isClang; + # Broken with no upstream fix available. + broken = lib.versionAtLeast postgresql.version "16"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index fa788db081ad..5c00051fb64f 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -24,7 +24,7 @@ buildPostgresqlExtension rec { platforms = postgresql.meta.platforms; license = licenses.bsd2; maintainers = [ ]; - # Broken on darwin and linux (JIT) with no upstream fix available. - broken = lib.versionAtLeast postgresql.version "16" && stdenv.cc.isClang; + # Broken with no upstream fix available. + broken = lib.versionAtLeast postgresql.version "16"; }; } From 7ab409bb287251780444dc2483a3ba3e641da9a9 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 1 Feb 2025 10:25:22 +0100 Subject: [PATCH 3/3] postgresqlPackages: enable strictDeps --- pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix | 2 ++ pkgs/servers/sql/postgresql/ext/anonymizer.nix | 4 +--- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 1 + pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 3 --- pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 1 + pkgs/servers/sql/postgresql/ext/pgtap.nix | 1 - pkgs/servers/sql/postgresql/ext/postgis.nix | 3 ++- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix b/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix index 03797b610827..a427b7f88053 100644 --- a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix +++ b/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix @@ -84,7 +84,9 @@ let )); }; + strictDeps = true; buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ]; + nativeBuildInputs = [ postgresql ] ++ prevAttrs.nativeBuildInputs or [ ]; installFlags = [ "DESTDIR=${placeholder "out"}" diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index 6b6b11cd82ce..e70a6afad1c4 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -15,9 +15,7 @@ buildPostgresqlExtension (finalAttrs: { inherit (pg-dump-anon) version src; - nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm; - - strictDeps = true; + nativeBuildInputs = lib.optional jitSupport llvm; # Needs to be after postInstall, where removeNestedNixStore runs preFixup = '' diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 232eec17e0ab..d459251a9205 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -11,6 +11,7 @@ buildPostgresqlExtension rec { pname = "cstore_fdw"; version = "1.7.0-unstable-2021-03-08"; + buildInputs = [ protobufc ]; nativeBuildInputs = [ protobufc ]; src = fetchFromGitHub { diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index 7bb4759e7396..0332bf986232 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -23,12 +23,9 @@ buildPostgresqlExtension (finalAttrs: { hash = "sha256-Sa9ltW3KV/69OCxD3gRcp5owL0oW+z3fs4fRBHbSh30="; }; - strictDeps = true; - nativeBuildInputs = [ cmake pkg-config - postgresql ]; buildInputs = [ diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index 11450a568fe4..151cd92173eb 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -19,6 +19,7 @@ buildPostgresqlExtension rec { }; buildInputs = [ curl ]; + nativeBuildInputs = [ curl ]; meta = with lib; { description = "HTTP client for PostgreSQL, retrieve a web page from inside the database"; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 314b1530583d..0dd670a0b4b3 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -22,7 +22,6 @@ buildPostgresqlExtension (finalAttrs: { }; nativeBuildInputs = [ - postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index e50dbab2996f..556bfd030de7 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -51,7 +51,6 @@ buildPostgresqlExtension (finalAttrs: { buildInputs = [ - libxml2 geos proj gdal @@ -65,8 +64,10 @@ buildPostgresqlExtension (finalAttrs: { autoconf automake libtool + libxml2 perl pkg-config + protobufc which ] ++ lib.optional jitSupport llvm; dontDisableStatic = true;