Merge branch 'develop' of github.com:supabase/postgres into ansible_cleanups

* 'develop' of github.com:supabase/postgres:
  feat: support multiple versions of the pgrouting extension (#1687)
  refactor(ansible): bring our ansible up to modern ansible-lint standards (#1819)
  feat: support multiple versions of the pg-graphql extension (#1761)

Author: hunleyd

ansible/vars.yml

@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: 17.5.1.034-orioledb
-  postgres17: 17.6.1.013
-  postgres15: 15.14.1.013
+  postgresorioledb-17: 17.5.1.036-orioledb
+  postgres17: 17.6.1.015
+  postgres15: 15.14.1.015
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0

nix/cargo-pgrx/buildPgrxExtension.nix

@@ -53,6 +53,10 @@
   buildFeatures ? [ ],
   cargoBuildFlags ? [ ],
   postgresql,
+  # enable override to generate bindings using bindgenHook.
+  # Some older versions of cargo-pgrx use a bindgenHook that is not compatible with the
+  # current clang version present in stdenv
+  bindgenHook ? rustPlatform.bindgenHook,
   # cargo-pgrx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the
   # dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g.
   # if you include the generated code in the output via postInstall.
@@ -87,12 +91,14 @@ let
     pushd "${buildAndTestSubdir}"
   '';
   maybeLeaveBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) "popd";
+  pgrxBinaryName = if builtins.compareVersions "0.7.4" cargo-pgrx.version >= 0 then "pgx" else "pgrx";
 
   pgrxPostgresMajor = lib.versions.major postgresql.version;
   preBuildAndTest = ''
     export PGRX_HOME=$(mktemp -d)
+    export PGX_HOME=$PGRX_HOME
     export PGDATA="$PGRX_HOME/data-${pgrxPostgresMajor}/"
-    cargo-pgrx pgrx init "--pg${pgrxPostgresMajor}" ${lib.getDev postgresql}/bin/pg_config
+    cargo-${pgrxBinaryName} ${pgrxBinaryName} init "--pg${pgrxPostgresMajor}" ${lib.getDev postgresql}/bin/pg_config
 
     # unix sockets work in sandbox, too.
     export PGHOST="$(mktemp -d)"
@@ -127,7 +133,7 @@ let
         cargo-pgrx
         postgresql
         pkg-config
-        rustPlatform.bindgenHook
+        bindgenHook
       ]
       ++ lib.optionals useFakeRustfmt [ fakeRustfmt ];
 
@@ -138,9 +144,10 @@ let
       ${preBuildAndTest}
       ${maybeEnterBuildAndTestSubdir}
 
-      PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \
+      export PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}"
+      export PGX_BUILD_FLAGS="$PGRX_BUILD_FLAGS"
       ${lib.optionalString stdenv.hostPlatform.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \
-      cargo pgrx package \
+      cargo ${pgrxBinaryName} package \
         --pg-config ${lib.getDev postgresql}/bin/pg_config \
         ${maybeDebugFlag} \
         --features "${builtins.concatStringsSep " " buildFeatures}" \
@@ -160,7 +167,7 @@ let
 
       ${maybeEnterBuildAndTestSubdir}
 
-      cargo-pgrx pgrx stop all
+      cargo-${pgrxBinaryName} ${pgrxBinaryName} stop all
 
       mv $out/${postgresql}/* $out
       mv $out/${postgresql.lib}/* $out

nix/cargo-pgrx/default.nix

@@ -20,13 +20,16 @@ let
       hash,
       cargoHash,
     }:
+    let
+      pname = if builtins.compareVersions "0.7.4" version >= 0 then "cargo-pgx" else "cargo-pgrx";
+    in
     rustPlatform.buildRustPackage rec {
       # rust-overlay uses 'cargo-auditable' wrapper for 'cargo' command, but it
       # is using older version 0.18.1 of 'cargo_metadata' which doesn't support
       # rust edition 2024, so we disable the 'cargo-auditable' just for now.
       # ref: https://github.com/oxalica/rust-overlay/issues/153
       auditable = false;
-      pname = "cargo-pgrx";
+      inherit pname;
       inherit version;
       src = fetchCrate { inherit version pname hash; };
       inherit cargoHash;

nix/cargo-pgrx/versions.json

@@ -1,4 +1,44 @@
 {
+  "0.6.1": {
+    "hash": "sha256-O4eHVbJBudybsPab+zr2eXnfheREMqLAHAKm2GDbfrs=",
+    "rust": {
+      "1.82.0": {
+        "cargoHash": "sha256-MucGrA3qXgJOcT2LMNmoNOhQi8QA3LuqgZEHKycLCCo="
+      }
+    }
+  },
+  "0.7.1": {
+    "hash": "sha256-t/gdlrBeP6KFkBFJiZUa8KKVJVYMf6753vQGKJdytss=",
+    "rust": {
+      "1.82.0": {
+        "cargoHash": "sha256-muce9wT4LAJmfNLWWEShARnpZgglXe/KrfxlitmGgXk="
+      }
+    }
+  },
+  "0.9.5": {
+    "hash": "sha256-GpXQUOBuojAqPXyRR+k8AVW2XzBbn6V0+2dhP4w4Vs8=",
+    "rust": {
+      "1.70.0": {
+        "cargoHash": "sha256-YbwGh3tbt8W9/VOu11fTWO9fRMUlrwJnG4wxUHuyX10="
+      }
+    }
+  },
+  "0.9.7": {
+    "hash": "sha256-uDBq7tUZ9f8h5nlRFR1mv4+Ty1OFtAk5P7OTNQPI1gI=",
+    "rust": {
+      "1.70.0": {
+        "cargoHash": "sha256-YTkjqMNF+cz5XtELh7+l8KwvRoVKQP7t98nkJwkW218="
+      }
+    }
+  },
+  "0.10.2": {
+    "hash": "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls=",
+    "rust": {
+      "1.70.0": {
+        "cargoHash": "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI="
+      }
+    }
+  },
   "0.11.2": {
     "hash": "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM=",
     "rust": {
@@ -57,5 +97,4 @@
       }
     }
   }
-
 }