Merge branch 'develop' into martonboros/psql-1530-prestart-site-extensions

Author: brainrake

nix/cargo-pgrx/default.nix

@@ -51,7 +51,6 @@ let
         homepage = "https://github.com/pgcentralfoundation/pgrx";
         changelog = "https://github.com/pgcentralfoundation/pgrx/releases/tag/v${version}";
         license = licenses.mit;
-        maintainers = with maintainers; [ happysalada ];
         mainProgram = "cargo-pgrx";
       };
     };

nix/docs/adding-new-package.md

@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Open-source vector similarity search for Postgres";
     homepage = "https://github.com/${src.owner}/${src.repo}";
-    maintainers = [ "olirice" ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };

nix/ext/gdal.nix

@@ -62,13 +62,6 @@ stdenv.mkDerivation rec {
     description = "Translator library for raster geospatial data formats (PostGIS-focused build)";
     homepage = "https://www.gdal.org/";
     license = licenses.mit;
-    maintainers =
-      with maintainers;
-      teams.geospatial.members
-      ++ [
-        marcweber
-        dotlambda
-      ];
     platforms = platforms.unix;
   };
 }

nix/ext/pgmq/default.nix

@@ -91,7 +91,6 @@ let
       meta = with lib; {
         description = "A lightweight message queue. Like AWS SQS and RSMQ but on Postgres.";
         homepage = "https://github.com/tembo-io/pgmq";
-        maintainers = with maintainers; [ olirice ];
         inherit (postgresql.meta) platforms;
         license = licenses.postgresql;
       };

nix/ext/plpgsql-check.nix

@@ -92,7 +92,6 @@ let
         homepage = "https://github.com/okbob/plpgsql_check";
         changelog = "https://github.com/okbob/plpgsql_check/releases/tag/v${version}";
         license = licenses.mit;
-        maintainers = [ maintainers.marsam ];
         inherit (postgresql.meta) platforms;
       };
     };

nix/ext/supautils.nix

@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "PostgreSQL extension for enhanced security";
     homepage = "https://github.com/supabase/${pname}";
-    maintainers = with maintainers; [ steve-chavez ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };

nix/pgbouncer.nix

@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
       replaceStrings [ "." ] [ "_" ] version
     }";
     license = licenses.isc;
-    maintainers = with maintainers; [ _1000101 ];
     platforms = platforms.all;
   };
 }

nix/postgresql/generic.nix

@@ -350,14 +350,6 @@ let
         license = licenses.postgresql;
         changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/";
         teams = [ ];
-        maintainers = with maintainers; [
-          thoughtpolice
-          danbst
-          globin
-          ivan
-          ma27
-          wolfgangwalther
-        ];
         pkgConfigModules = [
           "libecpg"
           "libecpg_compat"

testinfra/test_ami_nix.py

@@ -316,7 +316,7 @@ def gzip_then_base64_encode(s: str) -> str:
 runcmd:
     - 'sudo echo \"pgbouncer\" \"postgres\" >> /etc/pgbouncer/userlist.txt'
     - 'cd /tmp && aws s3 cp --region ap-southeast-1 s3://init-scripts-staging/project/init.sh .'
-    - 'bash init.sh "staging"'
+    - 'USE_LEGACY_INT_CA_SECRET=true bash init.sh "staging"'
     - 'touch /var/lib/init-complete'
     - 'rm -rf /tmp/*'
 users: