diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/security/cryptomator/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index cfde59a7e786c..f2cc86e0cb7ba 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -4,19 +4,25 @@ , maven, jdk, makeShellWrapper, glib, wrapGAppsHook }: -maven.buildMavenPackage rec { + +let + mavenJdk = maven.override { + jdk = jdk; + }; +in +mavenJdk.buildMavenPackage rec { pname = "cryptomator"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - hash = "sha256-4MjF2PDH0JB1biY4HO2wOC0i6EIGSlzkK6tDm8nzvIo="; + hash = "sha256-CiM18Rdt7B/TrU7AoNbxouFGC5Gfvm4oLxypYOCAFzA="; }; mvnParameters = "-Dmaven.test.skip=true"; - mvnHash = "sha256-rHLLYkZq3GGE0uhTgZT0tnsh+ChzQdpQ2e+SG1TwBvw="; + mvnHash = "sha256-7gv++Pc+wqmVYaAMgHhSy7xwChfVBgpDFxExzu3bXO0="; preBuild = '' VERSION=${version} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cac45c1deba1..a3be47e5bd176 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27107,7 +27107,7 @@ with pkgs; criu = callPackage ../os-specific/linux/criu { }; cryptomator = callPackage ../tools/security/cryptomator { - jdk = jdk.override { enableJavaFX = true; }; + jdk = jdk20.override { enableJavaFX = true; }; }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; |