nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241154 from bachp/cryptomator-1.9.1

Browse Source
This commit is contained in:
Franz Pletz 2023-08-11 05:34:33 +02:00 committed by GitHub
commit e8866c7597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/security/cryptomator/default.nix
View File

@ -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}

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

@ -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 { };