From 63685d8a0a875641ce67c6d9ffa00e0a6d2ef6fb Mon Sep 17 00:00:00 2001
From: Noah Markert <RamReso@gmail.com>
Date: Sun, 6 Oct 2024 19:29:59 +0200
Subject: [PATCH 1/2] flyway: 9.22.3 -> 10.20.1

---
 pkgs/by-name/fl/flyway/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix
index cd42388f0f82..1e2c189439c0 100644
--- a/pkgs/by-name/fl/flyway/package.nix
+++ b/pkgs/by-name/fl/flyway/package.nix
@@ -2,18 +2,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flyway";
-  version = "9.22.3";
+  version = "10.20.1";
   src = fetchurl {
-    url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-utAJpbU5NkKyJyyWB0yfwHZJxQAVJgiKm12wmGK1ojQ=";
+    url =
+      "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
+    sha256 = "sha256-ntFaXwF3EThHxR7rpAivTRDN4bgS1l0RFFyvbs/8dxE=";
   };
   nativeBuildInputs = [ makeWrapper ];
   dontBuild = true;
   dontStrip = true;
   installPhase = ''
     mkdir -p $out/bin $out/share/flyway
-    cp -r sql jars drivers conf $out/share/flyway
-    install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar lib/aad/*.jar lib/oracle_wallet/*.jar
+    cp -r drivers conf licenses README.txt $out/share/flyway
+    install -Dt $out/share/flyway/lib lib/*.jar lib/flyway/*.jar lib/oracle_wallet/*.jar lib/aad/msal4j-1.15.1.jar lib/aad/slf4j-api-1.7.30.jar
     makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
       --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
       --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
@@ -24,7 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
     version = testers.testVersion { package = finalAttrs.finalPackage; };
   };
   meta = with lib; {
-    description = "Evolve your Database Schema easily and reliably across all your instances";
+    description =
+      "Evolve your Database Schema easily and reliably across all your instances";
     longDescription = ''
       The Flyway command-line tool is a standalone Flyway distribution.
       It is primarily meant for users who wish to migrate their database from the command-line
@@ -35,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "flyway";
     downloadPage = "https://github.com/flyway/flyway";
     homepage = "https://flywaydb.org/";
-    changelog = "https://documentation.red-gate.com/fd/release-notes-for-flyway-engine-179732572.html";
+    changelog =
+      "https://documentation.red-gate.com/fd/release-notes-for-flyway-engine-179732572.html";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.asl20;
     platforms = platforms.unix;

From cfba4c287a5795a13d5e62badff55fb127043634 Mon Sep 17 00:00:00 2001
From: Noah Markert <RamReso@gmail.com>
Date: Wed, 30 Oct 2024 22:43:15 +0100
Subject: [PATCH 2/2] flyway: fix version check removed flag jarDirs, because
 it is not used

---
 pkgs/by-name/fl/flyway/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix
index 1e2c189439c0..c27b44f28961 100644
--- a/pkgs/by-name/fl/flyway/package.nix
+++ b/pkgs/by-name/fl/flyway/package.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
       --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
       --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
       --add-flags "org.flywaydb.commandline.Main" \
-      --add-flags "-jarDirs='$out/share/flyway/jars'"
   '';
   passthru.tests = {
     version = testers.testVersion { package = finalAttrs.finalPackage; };