From c64ab88f6c4c7e37f5b8c9ac1a501df6a1447b0e Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Mon, 10 Jul 2023 15:08:59 -0300 Subject: [PATCH 1/3] liquibase: include all jars from internal/lib instead of just a few --- pkgs/development/tools/database/liquibase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 2de4a7acc6ea..a11f214e1c20 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { in '' mkdir -p $out - mv ./{lib,licenses,internal/lib/liquibase-core.jar,internal/lib/postgresql.jar,internal/lib/picocli.jar} $out/ + mv ./{lib,licenses,internal/lib/*.jar} $out/ mkdir -p $out/share/doc/${pname}-${version} mv LICENSE.txt \ From 49d503a9fa55327a73621c266e8eb19f96def714 Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Mon, 10 Jul 2023 15:41:20 -0300 Subject: [PATCH 2/3] liquibase: include jars in --version output Moved jars to the `internal/lib` directory in an attempt to make them appear in the `liquibase --version` output. However it didn't help. I left the change though because the default installer also puts the jars into internal/lib. --- pkgs/development/tools/database/liquibase/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index a11f214e1c20..76f43a580ef4 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -48,7 +48,10 @@ stdenv.mkDerivation rec { in '' mkdir -p $out - mv ./{lib,licenses,internal/lib/*.jar} $out/ + mv ./{lib,licenses} $out/ + + mkdir -p $out/internal/lib + mv ./internal/lib/*.jar $out/internal/lib/ mkdir -p $out/share/doc/${pname}-${version} mv LICENSE.txt \ @@ -63,6 +66,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env bash # taken from the executable script in the source CP="" + ${addJars "$out/internal/lib"} ${addJars "$out/lib"} ${addJars "$out"} ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)} From 86115ca9db03a8ae7dd8af8130f15f611905e4b4 Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Mon, 10 Jul 2023 15:43:47 -0300 Subject: [PATCH 3/3] liquibase: indentation cleanup --- pkgs/development/tools/database/liquibase/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 76f43a580ef4..3309dbd41862 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -70,9 +70,8 @@ stdenv.mkDerivation rec { ${addJars "$out/lib"} ${addJars "$out"} ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)} - ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \ - liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"} + liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"} EOF chmod +x $out/bin/liquibase '';