From 73e63a6fd9683b39041b26320d8e8f9414682246 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 2 Sep 2023 04:20:00 +0000
Subject: [PATCH 1/4] flyway: fix build

Fixes https://github.com/NixOS/nixpkgs/issues/252926
---
 pkgs/development/tools/flyway/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 4fec2ef0c06..278fc2605d9 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec{
   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
+    install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar lib/aad/*.jar lib/oracle_wallet/*.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/*'" \

From 8f9ff6cec401ae294d59a925d9bf53d60d780172 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 2 Sep 2023 04:20:00 +0000
Subject: [PATCH 2/4] flyway: add testVersion to passthru.tests

---
 pkgs/development/tools/flyway/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 278fc2605d9..d480bf5a371 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,9 +1,10 @@
-{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
-stdenv.mkDerivation rec{
+{ lib, stdenv, fetchurl, jre_headless, makeWrapper, testers }:
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "flyway";
   version = "9.21.2";
   src = fetchurl {
-    url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
+    url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-7MIjXF1qgEye2Z/cyeuSFkEmXT8AxkwYfw+/UevsPFg=";
   };
   nativeBuildInputs = [ makeWrapper ];
@@ -19,6 +20,9 @@ stdenv.mkDerivation rec{
       --add-flags "org.flywaydb.commandline.Main" \
       --add-flags "-jarDirs='$out/share/flyway/jars'"
   '';
+  passthru.tests = {
+    version = testers.testVersion { package = finalAttrs.finalPackage; };
+  };
   meta = with lib; {
     description = "Evolve your Database Schema easily and reliably across all your instances";
     longDescription = ''
@@ -35,4 +39,4 @@ stdenv.mkDerivation rec{
     platforms = platforms.unix;
     maintainers = [ maintainers.cmcdragonkai ];
   };
-}
+})

From 9d4f92cbf4364f145e055d27b35d75d90031e4e0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 2 Sep 2023 04:20:00 +0000
Subject: [PATCH 3/4] flyway: add changelog to meta

---
 pkgs/development/tools/flyway/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index d480bf5a371..ed030371302 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     downloadPage = "https://github.com/flyway/flyway";
     homepage = "https://flywaydb.org/";
+    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 8119f85c674673f1f13e712d01d56c2e8d7afc31 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 2 Sep 2023 04:20:00 +0000
Subject: [PATCH 4/4] flyway: 9.21.2 -> 9.22.0

Changelog: https://documentation.red-gate.com/fd/release-notes-for-flyway-engine-179732572.html
---
 pkgs/development/tools/flyway/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index ed030371302..54f2056732b 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flyway";
-  version = "9.21.2";
+  version = "9.22.0";
   src = fetchurl {
     url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-7MIjXF1qgEye2Z/cyeuSFkEmXT8AxkwYfw+/UevsPFg=";
+    sha256 = "sha256-vdg66ETDfa0WG1TrRWJ9XpMSCE9sd5GlYAJY2TERC5Y=";
   };
   nativeBuildInputs = [ makeWrapper ];
   dontBuild = true;