Skip to content

Commit 6f43499

Browse files
committed
chore: must totally deactivate pljava package
1 parent ae51796 commit 6f43499

File tree

5 files changed

+4
-10
lines changed

5 files changed

+4
-10
lines changed

common-nix.vars.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.6.1.65-nix-staged"
1+
postgres-version = "15.6.1.66-nix-staged"

flake.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
./nix/ext/wrappers/default.nix
133133
./nix/ext/supautils.nix
134134
./nix/ext/plv8.nix
135-
./nix/ext/pljava.nix
135+
#./nix/ext/pljava.nix
136136
];
137137

138138
#Where we import and build the orioledb extension, we add on our custom extensions
@@ -419,8 +419,7 @@
419419
--subst-var-by 'PGSQL_SUPERUSER' '${pgsqlSuperuser}' \
420420
--subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' \
421421
--subst-var-by 'PSQL_CONF_FILE' '${configFile}' \
422-
--subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}' \
423-
--subst-var-by 'LIBJVM_LOCATION' '${pkgs.openjdk11}/lib/openjdk/lib/server/libjvm.so'
422+
--subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}'
424423
425424
chmod +x $out/bin/start-postgres-server
426425
'';
@@ -490,8 +489,7 @@
490489
initdb --locale=C
491490
492491
substitute ${./nix/tests/postgresql.conf.in} $PGDATA/postgresql.conf \
493-
--subst-var-by PGSODIUM_GETKEY_SCRIPT "${./nix/tests/util/pgsodium_getkey.sh}" \
494-
--subst-var-by PLJAVA_LIBJVM_LOCATION "${pkgs.openjdk11}/lib/openjdk/lib/server/libjvm.so"
492+
--subst-var-by PGSODIUM_GETKEY_SCRIPT "${./nix/tests/util/pgsodium_getkey.sh}"
495493
496494
497495
postgres -k /tmp >logfile 2>&1 &

nix/tests/postgresql.conf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,4 +793,3 @@ shared_preload_libraries = 'auto_explain,pgsodium'
793793
# Add settings for extensions here
794794

795795
pgsodium.getkey_script = '@PGSODIUM_GETKEY_SCRIPT@'
796-
pljava.libjvm_location = '@PLJAVA_LIBJVM_LOCATION@'

nix/tests/prime.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ CREATE EXTENSION IF NOT EXISTS pg_graphql;
2020
CREATE EXTENSION IF NOT EXISTS pg_jsonschema;
2121
CREATE EXTENSION IF NOT EXISTS hypopg;
2222
CREATE EXTENSION IF NOT EXISTS index_advisor;
23-
CREATE EXTENSION IF NOT EXISTS pljava;

nix/tools/run-server.sh.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ echo
3939
initdb -U "$PGSQL_SUPERUSER" -D "$DATDIR" --locale=C
4040

4141
echo "NOTE: patching postgresql.conf files"
42-
echo "pljava libjvm location: $PLJAVA_LIBJVM_LOCATION"
4342
sed -e "s#@PGSODIUM_GETKEY_SCRIPT@#$PGSODIUM_GETKEY_SCRIPT#g" \
44-
-e "s#@PLJAVA_LIBJVM_LOCATION@#$PLJAVA_LIBJVM_LOCATION#g" \
4543
$PSQL_CONF_FILE > "$DATDIR/postgresql.conf"
4644

4745
exec postgres -p "$PORTNO" -D "$DATDIR" -k /tmp

0 commit comments

Comments
 (0)