Update flyway and set jdk17 as requirement

This commit is contained in:
eikek
2023-11-05 23:11:22 +01:00
parent 46faa7aa40
commit bf0f692cd9
6 changed files with 14 additions and 13 deletions

View File

@ -19,7 +19,7 @@ object Dependencies {
val DoobieVersion = "1.0.0-RC2"
val EmilVersion = "0.13.0"
val FlexmarkVersion = "0.64.8"
val FlywayVersion = "9.22.3"
val FlywayVersion = "10.0.0"
val Fs2Version = "3.9.2"
val H2Version = "2.2.224"
val Http4sVersion = "0.23.23"
@ -311,6 +311,7 @@ object Dependencies {
// ASL 2.0
val flyway = Seq(
"org.flywaydb" % "flyway-core" % FlywayVersion,
"org.flywaydb" % "flyway-database-postgresql" % FlywayVersion,
"org.flywaydb" % "flyway-mysql" % FlywayVersion
)

View File

@ -1,19 +1,19 @@
let
nixpkgs = builtins.fetchTarball {
#url = "https://github.com/NixOS/nixpkgs/archive/92e990a8d6bc35f1089c76dd8ba68b78da90da59.tar.gz";
url = "channel:nixos-21.11";
url = "channel:nixos-23.05";
};
pkgs = import nixpkgs { };
initScript = pkgs.writeScript "docspell-build-init" ''
export LD_LIBRARY_PATH=
${pkgs.bash}/bin/bash -c "sbt -mem 4096 -java-home ${pkgs.openjdk11}/lib/openjdk"
${pkgs.bash}/bin/bash -c "sbt -mem 4096 -java-home ${pkgs.openjdk17}/lib/openjdk"
'';
in with pkgs;
buildFHSUserEnv {
name = "docspell-sbt";
targetPkgs = pkgs: with pkgs; [
netcat jdk11 wget which dpkg sbt git elmPackages.elm ncurses fakeroot mc
netcat jdk17 wget which dpkg sbt git elmPackages.elm ncurses fakeroot mc
zola yarn
# haskells http client needs this (to download elm packages)