Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d1dbdf0bf4b7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd80b19cb698
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 2, 2020

  1. flyway: fix jarDirs option 

    this is not a system property, but rather an argument to
org.flaywaydb.commandline.Main.main().  therefore, it must come after,
rather than before, the name of the main class.  (otherwise it's
interpreted as an argument to the VM itself.)

flyway also expects the option and value to be separated by '=', not ' '.

follows on to #76094
    @jerith666
    jerith666 committed Jan 2, 2020
    Copy the full SHA
    2867d19 View commit details

Commits on Jan 8, 2020

  1. Merge pull request #76835 from jerith666/flyway-jardirs 

    flyway: fix jarDirs option
    @marsam
    marsam authored Jan 8, 2020

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    dd80b19 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/tools/flyway/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/tools/flyway/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@
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/*'" \
--add-flags "-DjarDirs '$out/share/flyway/jars'" \
--add-flags "org.flywaydb.commandline.Main"
--add-flags "org.flywaydb.commandline.Main" \
--add-flags "-jarDirs='$out/share/flyway/jars'"
'';
meta = with stdenv.lib; {
description = "Evolve your Database Schema easily and reliably across all your instances";