feat: support a pg 14 version of postgres bundle

Author: samrose

flake.nix

@@ -166,7 +166,11 @@
             x != ./nix/ext/timescaledb-2.9.1.nix &&
             x != ./nix/ext/plv8.nix
         ) ourExtensions;
-
+        pg14FilteredExtensions = builtins.filter
+          (
+            x:
+            x != ./nix/ext/pg_stat_monitor.nix
+          ) ourExtensions;
         orioledbExtensions = orioleFilteredExtensions ++ [ ./nix/ext/orioledb.nix ];
         dbExtensions17 = orioleFilteredExtensions;
         getPostgresqlPackage = version:
@@ -213,6 +217,8 @@
               then orioledbExtensions
               else if (builtins.elem version [ "17" ])
               then dbExtensions17
+              else if (builtins.elem version [ "14" ])
+              then pg14FilteredExtensions
               else ourExtensions;
           in
           map (path: pkgs.callPackage path { inherit postgresql; }) extensionsToUse;
@@ -326,6 +332,7 @@
               SHELL_PATH = "${pkgs.bash}/bin/bash";
               PGSQL_DEFAULT_PORT = "${pgsqlDefaultPort}";
               PGSQL_SUPERUSER = "${pgsqlSuperuser}";
+              PSQL14_BINDIR = "${basePackages.psql_14.bin}";
               PSQL15_BINDIR = "${basePackages.psql_15.bin}";
               PSQL17_BINDIR = "${basePackages.psql_17.bin}";
               PSQL_CONF_FILE = "${paths.pgconfigFile}";
@@ -392,6 +399,7 @@
 
             # Define the available PostgreSQL versions
             postgresVersions = {
+              psql_14 = makePostgres "14";
               psql_15 = makePostgres "15";
               psql_17 = makePostgres "17";
               psql_orioledb-17 = makePostgres "orioledb-17";
@@ -408,6 +416,7 @@
               pkgs.callPackage ./nix/ext/pg_regress.nix {
                 postgresql = postgresqlPackage;
               };
+            postgresql_14 = getPostgresqlPackage "14";
             postgresql_15 = getPostgresqlPackage "15";
             postgresql_17 = getPostgresqlPackage "17";
             postgresql_orioledb-17 = getPostgresqlPackage "orioledb-17";
@@ -418,6 +427,7 @@
             cargo-pgrx_0_12_6 = pkgs.cargo-pgrx.cargo-pgrx_0_12_6;
             cargo-pgrx_0_12_9 = pkgs.cargo-pgrx.cargo-pgrx_0_12_9;
             # PostgreSQL versions.
+            psql_14 = postgresVersions.psql_14;
             psql_15 = postgresVersions.psql_15;
             psql_17 = postgresVersions.psql_17;
             psql_orioledb-17 = postgresVersions.psql_orioledb-17;
@@ -515,6 +525,7 @@
                 substitute ${./nix/tools/run-client.sh.in} $out/bin/start-postgres-client \
                   --subst-var-by 'PGSQL_DEFAULT_PORT' '${pgsqlDefaultPort}' \
                   --subst-var-by 'PGSQL_SUPERUSER' '${pgsqlSuperuser}' \
+                  --subst-var-by 'PSQL14_BINDIR' '${basePackages.psql_14.bin}' \
                   --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' \
                   --subst-var-by 'PSQL17_BINDIR' '${basePackages.psql_17.bin}' \
                   --subst-var-by 'PSQLORIOLEDB17_BINDIR' '${basePackages.psql_orioledb-17.bin}' \

nix/ext/pgaudit.nix

@@ -14,6 +14,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}");
 in
 stdenv.mkDerivation {

nix/postgresql/14.nix

@@ -0,0 +1,14 @@
+import ./generic.nix {
+  version = "14.18";
+   hash = "sha256-g6sp1r/D3Fiy7TxmQRT9++tqBFDEuNf6aa7pHjyhT44=";
+  # muslPatches = {
+  #   disable-test-collate-icu-utf8 = {
+  #     url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
+  #     hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM=";
+  #   };
+  #   dont-use-locale-a = {
+  #     url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/dont-use-locale-a-on-musl.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
+  #     hash = "sha256-fk+y/SvyA4Tt8OIvDl7rje5dLs3Zw+Ln1oddyYzerOo=";
+  #   };
+  # };
+}

nix/postgresql/default.nix

@@ -1,6 +1,7 @@
 self:
 let
   versions = {
+    postgresql_14 = ./14.nix;
     postgresql_15 = ./15.nix;
     postgresql_17 = ./17.nix;
     postgresql_orioledb-17 = ./orioledb-17.nix;

nix/tools/run-client.sh.in

@@ -13,7 +13,7 @@ print_help() {
     echo "Usage: nix run .#start-client -- [options]"
     echo
     echo "Options:"
-    echo "  -v, --version [15|16|orioledb-16]  Specify the PostgreSQL version to use (required)"
+    echo "  -v, --version [14|15|16|orioledb-16]  Specify the PostgreSQL version to use (required)"
     echo "  -u, --user USER                    Specify the user/role to use (default: postgres)"
     echo "  -h, --help                         Show this help message"
     echo
@@ -81,7 +81,11 @@ if [[ -z "$PSQL_VERSION" ]]; then
 fi
 
 # Determine PostgreSQL version
-if [ "$PSQL_VERSION" == "15" ]; then
+if [ "$PSQL_VERSION" == "14" ]; then
+    echo "Starting client for PSQL 14"
+    PSQL14=@PSQL14_BINDIR@
+    BINDIR="$PSQL14"
+elif [ "$PSQL_VERSION" == "15" ]; then
     echo "Starting client for PSQL 15"
     PSQL15=@PSQL15_BINDIR@
     BINDIR="$PSQL15"

nix/tools/run-server.sh.in

@@ -141,7 +141,12 @@ else
     PGSODIUM_GETKEY_SCRIPT="${PGSODIUM_GETKEY_SCRIPT:-@PGSODIUM_GETKEY@}"
 fi
 # Verify version and set binary directory
-if [ "$VERSION" == "15" ]; then
+
+if [ "$VERSION" == "14" ]; then
+    echo "Starting server for PSQL 14"
+    PSQL14=@PSQL14_BINDIR@
+    BINDIR="$PSQL14"
+elif [ "$VERSION" == "15" ]; then
     echo "Starting server for PSQL 15"
     PSQL15=@PSQL15_BINDIR@
     BINDIR="$PSQL15"
@@ -154,7 +159,7 @@ elif [ "$VERSION" == "orioledb-17" ]; then
     PSQLORIOLEDB17=@PSQLORIOLEDB17_BINDIR@
     BINDIR="$PSQLORIOLEDB17"
 else
-    echo "Please provide a valid Postgres version (15, 17, orioledb-17)"
+    echo "Please provide a valid Postgres version (14, 15, 17, orioledb-17)"
     exit 1
 fi