Merge: postgresqlPackages: enable strictDeps (#378482)

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"}"

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 = ''

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

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 {

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 = [

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";
   };
 }

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";

pkgs/servers/sql/postgresql/ext/pgtap.nix

@@ -22,7 +22,6 @@ buildPostgresqlExtension (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    postgresql
     perl
     perlPackages.TAPParserSourceHandlerpgTAP
     which

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;

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";
   };
 }