diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-18 01:28:19 +0300 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-18 01:28:19 +0300 |
commit | a2626c89a5d6bb64d4ce9ccbf5287c615d1be941 (patch) | |
tree | c65533c3e6debc588d3075da5d573d6999efa1d5 /pkgs/applications/misc/dbeaver | |
parent | 44f784b44de5a709a2ce22e951aa6fa728154b95 (diff) | |
download | nixpkgs-a2626c89a5d6bb64d4ce9ccbf5287c615d1be941.tar nixpkgs-a2626c89a5d6bb64d4ce9ccbf5287c615d1be941.tar.gz nixpkgs-a2626c89a5d6bb64d4ce9ccbf5287c615d1be941.tar.bz2 nixpkgs-a2626c89a5d6bb64d4ce9ccbf5287c615d1be941.tar.lz nixpkgs-a2626c89a5d6bb64d4ce9ccbf5287c615d1be941.tar.xz nixpkgs-a2626c89a5d6bb64d4ce9ccbf5287c615d1be941.tar.zst nixpkgs-a2626c89a5d6bb64d4ce9ccbf5287c615d1be941.zip |
dbeaver: cleanup
Diffstat (limited to 'pkgs/applications/misc/dbeaver')
-rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 82d8a0f5421..a42fb298df0 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -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" ]; |