Skip to content

squirrel-sql: fix the launcher script to allow JDK 19 #235096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
khumba wants to merge 1 commit into from
Closed

squirrel-sql: fix the launcher script to allow JDK 19 #235096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/tools/database/squirrel-sql/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-LKX8yNSLs60546ZcvLlQF3e++VxHmPsczui4cfrpia0=";
};

patches = [
./fix-launcher-version-check.patch
];

nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ jre ];

Expand Down
27 changes: 27 additions & 0 deletions pkgs/development/tools/database/squirrel-sql/fix-launcher-version-check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Squirrel SQL 4.5.1 adds support for JDK 19, but the launcher scripts need to be
updated to allow it.

diff -ru a/squirrelsql-4.5.1-standard/squirrel-sql.bat b/squirrelsql-4.5.1-standard/squirrel-sql.bat
--- a/squirrelsql-4.5.1-standard/squirrel-sql.bat 2022-11-13 01:40:04.000000000 -0800
+++ b/squirrelsql-4.5.1-standard/squirrel-sql.bat 2023-05-30 17:32:22.825494660 -0700
@@ -23,7 +23,7 @@
if NOT "%removed%"=="\" goto strip
set SQUIRREL_SQL_HOME=%basedir%

-"%LOCAL_JAVA%" -cp "%SQUIRREL_SQL_HOME%\lib\versioncheck.jar" JavaVersionChecker 11 12 13 14 15 16 17
+"%LOCAL_JAVA%" -cp "%SQUIRREL_SQL_HOME%\lib\versioncheck.jar" JavaVersionChecker 11 12 13 14 15 16 17 18 19
if ErrorLevel 1 goto ExitForWrongJavaVersion

:launchsquirrel
diff -ru a/squirrelsql-4.5.1-standard/squirrel-sql.sh b/squirrelsql-4.5.1-standard/squirrel-sql.sh
--- a/squirrelsql-4.5.1-standard/squirrel-sql.sh 2022-11-13 01:40:04.000000000 -0800
+++ b/squirrelsql-4.5.1-standard/squirrel-sql.sh 2023-05-30 17:29:27.487981752 -0700
@@ -45,7 +45,7 @@
# should be able to be run by that version or higher. The arguments to JavaVersionChecker below specify the
# minimum acceptable version (first arg) and any other acceptable subsequent versions. <MAJOR>.<MINOR> should
# be all that is necessary for the version form.
-$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 11 12 13 14 15 16 17
+$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 11 12 13 14 15 16 17 18 19
if [ "$?" != "0" ]; then
exit
fi