pyrox.dev / nixpkgs
lol
fork atom

cryptomator: 1.10.1 -> 1.11.0

Update the version, use Jdk21, and update the install flags based on the
appimage build script

Nicolas Mémeint 8039ea7a 9fda6d7c

+11 -9
unified split
+10 -8
pkgs/tools/security/cryptomator/default.nix
··· 13 assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` 14 mavenJdk.buildMavenPackage rec { 15 pname = "cryptomator"; 16 - version = "1.10.1"; 17 18 src = fetchFromGitHub { 19 owner = "cryptomator"; 20 repo = "cryptomator"; 21 rev = version; 22 - hash = "sha256-xhj7RUurBRq9ZIDAlcq7KyYGnLqc+vTjaf2VMNStpVQ"; 23 }; 24 25 mvnParameters = "-Dmaven.test.skip=true"; 26 - mvnHash = "sha256-XAIwKn8wMqILMQbg9wM4kHAaRSGWQaBx9AXQyJuUO5k="; 27 28 preBuild = '' 29 VERSION=${version} ··· 42 --add-flags "--enable-preview" \ 43 --add-flags "--class-path '$out/share/cryptomator/libs/*'" \ 44 --add-flags "--module-path '$out/share/cryptomator/mods'" \ 45 - --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \ 46 - --add-flags "-Dcryptomator.pluginDir='~/.local/share/Cryptomator/plugins'" \ 47 - --add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'" \ 48 - --add-flags "-Dcryptomator.ipcSocketPath='~/.config/Cryptomator/ipc.socket'" \ 49 - --add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'" \ 50 --add-flags "-Dcryptomator.showTrayIcon=false" \ 51 --add-flags "-Dcryptomator.buildNumber='nix'" \ 52 --add-flags "-Dcryptomator.appVersion='${version}'" \
··· 13 assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` 14 mavenJdk.buildMavenPackage rec { 15 pname = "cryptomator"; 16 + version = "1.11.0"; 17 18 src = fetchFromGitHub { 19 owner = "cryptomator"; 20 repo = "cryptomator"; 21 rev = version; 22 + hash = "sha256-NMNlDEUpwKUywzhXhxlNX7NiE+6wOov2Yt8nTfbKTNI="; 23 }; 24 25 mvnParameters = "-Dmaven.test.skip=true"; 26 + mvnHash = "sha256-jIHMUj7ZQFu4XAvWUywj4f0PbmLHGtU5VRG0ZuKm3mA="; 27 28 preBuild = '' 29 VERSION=${version} ··· 42 --add-flags "--enable-preview" \ 43 --add-flags "--class-path '$out/share/cryptomator/libs/*'" \ 44 --add-flags "--module-path '$out/share/cryptomator/mods'" \ 45 + --add-flags "-Dfile.encoding='utf-8'" \ 46 + --add-flags "-Dcryptomator.logDir='@{userhome}/.local/share/Cryptomator/logs'" \ 47 + --add-flags "-Dcryptomator.pluginDir='@{userhome}/.local/share/Cryptomator/plugins'" \ 48 + --add-flags "-Dcryptomator.settingsPath='@{userhome}/.config/Cryptomator/settings.json'" \ 49 + --add-flags "-Dcryptomator.p12Path='@{userhome}/.config/Cryptomator/key.p12'" \ 50 + --add-flags "-Dcryptomator.ipcSocketPath='@{userhome}/.config/Cryptomator/ipc.socket'" \ 51 + --add-flags "-Dcryptomator.mountPointsDir='@{userhome}/.local/share/Cryptomator/mnt'" \ 52 --add-flags "-Dcryptomator.showTrayIcon=false" \ 53 --add-flags "-Dcryptomator.buildNumber='nix'" \ 54 --add-flags "-Dcryptomator.appVersion='${version}'" \
+1 -1
pkgs/top-level/all-packages.nix
··· 27710 criu = callPackage ../os-specific/linux/criu { }; 27711 27712 cryptomator = callPackage ../tools/security/cryptomator { 27713 - jdk = jdk20.override { enableJavaFX = true; }; 27714 }; 27715 27716 cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
··· 27710 criu = callPackage ../os-specific/linux/criu { }; 27711 27712 cryptomator = callPackage ../tools/security/cryptomator { 27713 + jdk = jdk21.override { enableJavaFX = true; }; 27714 }; 27715 27716 cryptsetup = callPackage ../os-specific/linux/cryptsetup { };