diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2023-08-11 05:34:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-11 05:34:33 +0200 |
| commit | e8866c75973d93104ddff24d78b786d605e33c31 (patch) | |
| tree | e1d1804be2584c25d0d909e3c8592c24a044c756 /pkgs | |
| parent | cb6dd866f283a2434df70193f590cd56efaed20d (diff) | |
| parent | 557c380c6d8c13819095a0a33bf726e3f99443f3 (diff) | |
Merge pull request #241154 from bachp/cryptomator-1.9.1
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 238a74cc95456..90dcfcde1eea1 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 080d6dc5ba033..9e21817286a01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27541,7 +27541,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 { }; |