BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #266307 from nicomem/cryptomator

Browse source 
cryptomator: 1.10.1 -> 1.11.0
This commit is contained in:
Pascal Bach 2023-11-13 22:14:03 +01:00 committed by GitHub
commit 6be9316ded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/tools/security/cryptomator/default.nix
View file

@ -13,17 +13,17 @@ in
assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'`
mavenJdk.buildMavenPackage rec {
pname = "cryptomator";
version = "1.10.1";
version = "1.11.0";
src = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator";
rev = version;
hash = "sha256-xhj7RUurBRq9ZIDAlcq7KyYGnLqc+vTjaf2VMNStpVQ";
hash = "sha256-NMNlDEUpwKUywzhXhxlNX7NiE+6wOov2Yt8nTfbKTNI=";
};
mvnParameters = "-Dmaven.test.skip=true";
mvnHash = "sha256-XAIwKn8wMqILMQbg9wM4kHAaRSGWQaBx9AXQyJuUO5k=";
mvnHash = "sha256-jIHMUj7ZQFu4XAvWUywj4f0PbmLHGtU5VRG0ZuKm3mA=";
preBuild = ''
VERSION=${version}
@ -42,11 +42,13 @@ mavenJdk.buildMavenPackage rec {
--add-flags "--enable-preview" \
--add-flags "--class-path '$out/share/cryptomator/libs/*'" \
--add-flags "--module-path '$out/share/cryptomator/mods'" \
--add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \
--add-flags "-Dcryptomator.pluginDir='~/.local/share/Cryptomator/plugins'" \
--add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'" \
--add-flags "-Dcryptomator.ipcSocketPath='~/.config/Cryptomator/ipc.socket'" \
--add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'" \
--add-flags "-Dfile.encoding='utf-8'" \
--add-flags "-Dcryptomator.logDir='@{userhome}/.local/share/Cryptomator/logs'" \
--add-flags "-Dcryptomator.pluginDir='@{userhome}/.local/share/Cryptomator/plugins'" \
--add-flags "-Dcryptomator.settingsPath='@{userhome}/.config/Cryptomator/settings.json'" \
--add-flags "-Dcryptomator.p12Path='@{userhome}/.config/Cryptomator/key.p12'" \
--add-flags "-Dcryptomator.ipcSocketPath='@{userhome}/.config/Cryptomator/ipc.socket'" \
--add-flags "-Dcryptomator.mountPointsDir='@{userhome}/.local/share/Cryptomator/mnt'" \
--add-flags "-Dcryptomator.showTrayIcon=false" \
--add-flags "-Dcryptomator.buildNumber='nix'" \
--add-flags "-Dcryptomator.appVersion='${version}'" \

2
pkgs/top-level/all-packages.nix
View file

@ -27717,7 +27717,7 @@ with pkgs;
criu = callPackage ../os-specific/linux/criu { };
cryptomator = callPackage ../tools/security/cryptomator {
jdk = jdk20.override { enableJavaFX = true; };
jdk = jdk21.override { enableJavaFX = true; };
};
cryptsetup = callPackage ../os-specific/linux/cryptsetup { };