From a2626c89a5d6bb64d4ce9ccbf5287c615d1be941 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 18 Jun 2023 01:28:19 +0300
Subject: [PATCH] dbeaver: cleanup

---
 pkgs/applications/misc/dbeaver/default.nix  | 23 +++++++++++----------
 pkgs/development/java-modules/maven-fod.nix |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 82d8a0f54216..a42fb298df01 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" ];
diff --git a/pkgs/development/java-modules/maven-fod.nix b/pkgs/development/java-modules/maven-fod.nix
index ba6ec8ae9e0e..8f56c4aa9b32 100644
--- a/pkgs/development/java-modules/maven-fod.nix
+++ b/pkgs/development/java-modules/maven-fod.nix
@@ -4,12 +4,12 @@
 }:
 
 { src
-, patches ? []
+, patches ? [ ]
 , pname
 , version
 , mvnSha256 ? "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
 , mvnHash ? "sha256-${mvnSha256}"
-, mvnFetchExtraArgs ? {}
+, mvnFetchExtraArgs ? { }
 , mvnParameters ? ""
 , ...
 } @args: