chore: resolving merge conflicts

Author: samrose

flake.nix

@@ -128,7 +128,6 @@
           ./nix/ext/wrappers/default.nix
           ./nix/ext/supautils.nix
           ./nix/ext/plv8.nix
-          ./nix/ext/pljava.nix
         ];
 
         #Where we import and build the orioledb extension, we add on our custom extensions
@@ -413,8 +412,7 @@
                 --subst-var-by 'PGSQL_SUPERUSER' '${pgsqlSuperuser}' \
                 --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' \
                 --subst-var-by 'PSQL_CONF_FILE' '${configFile}' \
-                --subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}' \
-                --subst-var-by 'LIBJVM_LOCATION' '${pkgs.openjdk11}/lib/openjdk/lib/server/libjvm.so'
+                --subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}'
 
               chmod +x $out/bin/start-postgres-server
             '';
@@ -477,16 +475,13 @@
           pkgs.runCommand "postgres-${pgpkg.version}-check-harness"
             {
               nativeBuildInputs = with pkgs; [ coreutils bash pgpkg pg_prove procps ];
-              propagatedBuildInputs = with pkgs; [ openjdk11 ];
             } ''
             export PGDATA=/tmp/pgdata
             mkdir -p $PGDATA
             initdb --locale=C
 
             substitute ${./nix/tests/postgresql.conf.in} $PGDATA/postgresql.conf \
-              --subst-var-by PGSODIUM_GETKEY_SCRIPT "${./nix/tests/util/pgsodium_getkey.sh}" \
-              --subst-var-by PLJAVA_LIBJVM_LOCATION "${pkgs.openjdk11}/lib/openjdk/lib/server/libjvm.so"
-
+              --subst-var-by PGSODIUM_GETKEY_SCRIPT "${./nix/tests/util/pgsodium_getkey.sh}"
 
             postgres -k /tmp >logfile 2>&1 &
             sleep 2

nix/tools/run-server.sh.in

@@ -39,9 +39,7 @@ echo
 initdb -U "$PGSQL_SUPERUSER" -D "$DATDIR" --locale=C
 
 echo "NOTE: patching postgresql.conf files"
-echo "pljava libjvm location: $PLJAVA_LIBJVM_LOCATION"
 sed -e "s#@PGSODIUM_GETKEY_SCRIPT@#$PGSODIUM_GETKEY_SCRIPT#g" \
-    -e "s#@PLJAVA_LIBJVM_LOCATION@#$PLJAVA_LIBJVM_LOCATION#g" \
     $PSQL_CONF_FILE > "$DATDIR/postgresql.conf"
 
 exec postgres -p "$PORTNO" -D "$DATDIR" -k /tmp