chore: bump release to test

Author: samrose

ansible/vars.yml

@@ -9,21 +9,19 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-<<<<<<< HEAD
-  postgresorioledb-17: "17.0.1.106-orioledb"
-  postgres17: "17.4.1.056"
-  postgres15: "15.8.1.113"
-=======
-  postgresorioledb-17: "17.0.1.088-orioledb"
-  postgres17: "17.4.1.038"
-  postgres15: "15.8.1.094"
-  postgres14: "14.18.1.001-test-3"
+  postgresorioledb-17: "17.0.1.107-orioledb-rc1"
+  postgres17: "17.4.1.057-rc1"
+  postgres15: "15.8.1.114-rc1"
+  postgres14: "14.18.1.001-rc1" #legacy for internal maintenance only. 
+
 
 # Note, postgres14 is not built on every release, but is available in the nix cache. 
 # postgres14 is included here to support upgrading from postgres14 to newer versions.
 # an image can be created with a special workflow that builds postgres14 image. 
 # Supabase will not create and release postgres14 images other than as a utility for internal use.
->>>>>>> 316bfef5 (chore: version bump for test)
+# Supase strongly recommends using postgres17 or newer for self-hosted Supabase/postgres. 
+# Supabase offers no support of any kind for postgres14.
+
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

nix/config.nix

@@ -41,6 +41,10 @@ in
       defaults = { };
       supportedPostgresVersions = {
         postgres = {
+          "14" = {
+            version = "14.18";
+            hash = "sha256-g6sp1r/D3Fiy7TxmQRT9++tqBFDEuNf6aa7pHjyhT44=";
+          };
           "15" = {
             version = "15.8";
             hash = "sha256-RANRX5pp7rPv68mPMLjGlhIr/fiV6Ss7I/W452nty2o=";

nix/ext/pg_stat_monitor.nix

@@ -5,17 +5,31 @@
   postgresql,
 }:
 
+let
+  source =
+    if lib.versionAtLeast postgresql.version "15" then
+      {
+        version = "2.1.0";
+        hash = "sha256-STJVvvrLVLe1JevNu6u6EftzAWv+X+J8lu66su7Or2s=";
+      }
+    else
+      {
+        version = "1.1.1";
+        hash = "sha256-S4N4Xnbkz57ue6f/eGjuRi64xT0NXjpMJiNNZnbbvbU=";
+      };
+in
+
 stdenv.mkDerivation rec {
   pname = "pg_stat_monitor";
-  version = "2.1.0";
+  inherit (source) version;
 
   buildInputs = [ postgresql ];
 
   src = fetchFromGitHub {
     owner = "percona";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-STJVvvrLVLe1JevNu6u6EftzAWv+X+J8lu66su7Or2s=";
+    hash = source.hash;
   };
 
   makeFlags = [ "USE_PGXS=1" ];
@@ -33,6 +47,5 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/percona/${pname}";
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
-    broken = lib.versionOlder postgresql.version "15";
   };
 }

nix/ext/pgaudit.nix

@@ -22,6 +22,10 @@ let
         version = "1.7.0";
         hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw=";
       };
+      "14" = {
+        version = "1.6.3";
+        hash = "sha256-KgLidJHjUK9BTp6ffmGUj1chcwIe6IzlcadRpGCfNdM=";
+      };
     }
     .${lib.versions.major postgresql.version}
     or (throw "Source for pgaudit is not available for ${postgresql.version}");

nix/ext/versions.json

@@ -2,6 +2,7 @@
   "wrappers": {
     "0.5.3": {
       "postgresql": [
+        "14",
         "15",
         "17",
         "orioledb-17"

nix/overlays/default.nix

@@ -7,6 +7,7 @@
     # explicit is better.
 
     inherit (self.packages.${final.system})
+      postgresql_14
       postgresql_15
       postgresql_17
       postgresql_orioledb-17

nix/packages/default.nix

@@ -20,6 +20,7 @@
         pkgs.callPackage ../ext/pg_regress.nix { postgresql = postgresqlPackage; };
       pgsqlSuperuser = "supabase_admin";
       pkgs-lib = pkgs.callPackage ./lib.nix {
+        psql_legacy-14 = self'.packages."psql_legacy-14/bin";
         psql_15 = self'.packages."psql_15/bin";
         psql_17 = self'.packages."psql_17/bin";
         psql_orioledb-17 = self'.packages."psql_orioledb-17/bin";
@@ -43,6 +44,7 @@
           run-testinfra = pkgs.callPackage ./run-testinfra.nix { };
           show-commands = pkgs.callPackage ./show-commands.nix { };
           start-client = pkgs.callPackage ./start-client.nix {
+            psql_legacy-14 = self'.packages."psql_legacy-14/bin";
             psql_15 = self'.packages."psql_15/bin";
             psql_17 = self'.packages."psql_17/bin";
             psql_orioledb-17 = self'.packages."psql_orioledb-17/bin";

nix/packages/lib.nix

@@ -1,6 +1,7 @@
 {
   psql_17,
   psql_15,
+  psql_legacy-14,
   psql_orioledb-17,
   defaults,
   supabase-groonga,
@@ -76,6 +77,7 @@
         SHELL_PATH = "${pkgs.bash}/bin/bash";
         PGSQL_DEFAULT_PORT = "${defaults.port}";
         PGSQL_SUPERUSER = "${defaults.superuser}";
+        PSQL14_BINDIR = "${psql_legacy-14}";
         PSQL15_BINDIR = "${psql_15}";
         PSQL17_BINDIR = "${psql_17}";
         PSQL_CONF_FILE = "${paths.pgconfigFile}";

nix/packages/postgres.nix

@@ -165,6 +165,7 @@
         recurseForDerivations = true;
       };
       basePackages = {
+        psql_legacy-14 = makePostgres "14";
         psql_15 = makePostgres "15";
         psql_17 = makePostgres "17";
         psql_orioledb-17 = makePostgres "orioledb-17";

nix/packages/start-client.nix

@@ -1,5 +1,6 @@
 {
   runCommand,
+  psql_legacy-14,
   psql_15,
   psql_17,
   psql_orioledb-17,
@@ -16,6 +17,7 @@ runCommand "start-postgres-client" { } ''
   substitute ${../tools/run-client.sh.in} $out/bin/start-postgres-client \
     --subst-var-by 'PGSQL_DEFAULT_PORT' '${defaults.port}' \
     --subst-var-by 'PGSQL_SUPERUSER' '${defaults.superuser}' \
+    --subst-var-by 'PSQL14_BINDIR' '${psql_legacy-14}' \
     --subst-var-by 'PSQL15_BINDIR' '${psql_15}' \
     --subst-var-by 'PSQL17_BINDIR' '${psql_17}' \
     --subst-var-by 'PSQLORIOLEDB17_BINDIR' '${psql_orioledb-17}' \