nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238335 from wegank/dbeaver-cleanup

Browse Source 
dbeaver: cleanup
This commit is contained in:
Weijia Wang 2023-06-18 01:50:45 +03:00 committed by GitHub
commit b54b95b439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/misc/dbeaver/default.nix
View File

@ -19,24 +19,25 @@
, javaPackages
}:
let mavenJdk17 = maven.override {
jdk = jdk17;
};
in (javaPackages.mavenfod.override {
maven = mavenJdk17; # use overridden maven version (see dbeaver's entry in all-packages.nix)
let
mavenJdk17 = maven.override {
jdk = jdk17;
};
in
(javaPackages.mavenfod.override {
maven = mavenJdk17;
}) rec {
pname = "dbeaver";
version = "22.2.2"; # When updating also update mvnSha256
version = "22.2.2"; # When updating also update mvnHash
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
hash = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
};
mvnSha256 = "87pf7XRXCuZlAbL54pX+a5Lo/874DmUr/W37/V+5YpQ=";
mvnHash = "sha256-87pf7XRXCuZlAbL54pX+a5Lo/874DmUr/W37/V+5YpQ=";
mvnParameters = "-P desktop,all-platforms";
nativeBuildInputs = [
@ -80,7 +81,7 @@ in (javaPackages.mavenfod.override {
aarch64-darwin = "aarch64";
aarch64-linux = "aarch64";
x86_64-darwin = "x86_64";
x86_64-linux = "x86_64";
x86_64-linux = "x86_64";
};
systemPlatform = platformMap.${stdenv.hostPlatform.system} or (throw "dbeaver not supported on ${stdenv.hostPlatform.system}");
@ -133,7 +134,7 @@ in (javaPackages.mavenfod.override {
'';
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # dependencies from maven
binaryBytecode # dependencies from maven
];
license = licenses.asl20;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];

4
pkgs/development/java-modules/maven-fod.nix
View File

@ -4,12 +4,12 @@
}:
{ src
, patches ? []
, patches ? [ ]
, pname
, version
, mvnSha256 ? "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
, mvnHash ? "sha256-${mvnSha256}"
, mvnFetchExtraArgs ? {}
, mvnFetchExtraArgs ? { }
, mvnParameters ? ""
, ...
} @args: