From 5d8618deffef6501bff0e799c10351b075557df3 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 4 Jul 2024 23:06:17 +0200
Subject: [PATCH] pkgs/gerrit: upgrade to 3.10.0

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 overlays/gerrit.nix             | 25 ++++++++++++++++++++++++-
 pkgs/gerrit/default.nix         | 14 ++++----------
 pkgs/gerrit_plugins/builder.nix |  2 ++
 services/gerrit/default.nix     |  2 +-
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/overlays/gerrit.nix b/overlays/gerrit.nix
index f5d6176..e74d58b 100644
--- a/overlays/gerrit.nix
+++ b/overlays/gerrit.nix
@@ -1,6 +1,29 @@
 self: super: {
   buildGerrit = self.callPackage ../pkgs/gerrit { };
-  gerrit = self.buildGerrit { };
+  gerrit = self.buildGerrit {
+    name = "gerrit-3.9.1";
+    version = "3.9.1";
+    src = self.fetchgit {
+      url = "https://gerrit.googlesource.com/gerrit";
+      rev = "620a819cbf3c64fff7a66798822775ad42c91d8e";
+      branchName = "v3.9.1";
+      sha256 = "sha256:1mdxbgnx3mpxand4wq96ic38bb4yh45q271h40jrk7dk23sgmz02";
+      fetchSubmodules = true;
+    };
+    fetchHash = "sha256-rsYQR6/RO5NM3/fnB3lEmbz876B59QWxWpE3M/Z4rK4=";
+  };
+  gerrit_3_10 = self.buildGerrit {
+    name = "gerrit-3.10.0";
+    version = "3.10.0";
+    src = self.fetchgit {
+      url = "https://gerrit.googlesource.com/gerrit";
+      rev = "e40cda1668ee1c6e4dc27accaac93d57b028528e";
+      branchName = "v3.10.0";
+      sha256 = "sha256-IikH7hY7TF3OcZfD9y6+srFk8Q34TMYWoloziPfd2As=";
+      fetchSubmodules = true;
+    };
+    fetchHash = self.lib.fakeHash;
+  };
   buildGerritBazelPlugin = self.callPackage ../pkgs/gerrit_plugins/builder.nix { 
     inherit (self) buildGerrit;
   };
diff --git a/pkgs/gerrit/default.nix b/pkgs/gerrit/default.nix
index 3fc9862..ef5c1b2 100644
--- a/pkgs/gerrit/default.nix
+++ b/pkgs/gerrit/default.nix
@@ -1,11 +1,5 @@
-{ buildFHSUserEnv, writeShellScriptBin, buildBazelPackage, fetchgit, unzip }:
-{ name ? "gerrit-${version}", version ? "3.9.1", src ? (fetchgit {
-    url = "https://gerrit.googlesource.com/gerrit";
-    rev = "620a819cbf3c64fff7a66798822775ad42c91d8e";
-    branchName = "v${version}";
-    sha256 = "sha256:1mdxbgnx3mpxand4wq96ic38bb4yh45q271h40jrk7dk23sgmz02";
-    fetchSubmodules = true;
-  }), bazelTargets ? [ "release" "api-skip-javadoc" ]
+{ buildFHSUserEnv, writeShellScriptBin, buildBazelPackage, fetchgit, unzip, lib }:
+{ name, version, src, fetchHash, bazelTargets ? [ "release" "api-skip-javadoc" ]
 }:
 let
   bazelRunScript = writeShellScriptBin "bazel-run" ''
@@ -34,7 +28,7 @@ in
 buildBazelPackage {
   inherit name version src;
 
-  patches = [
+  patches = lib.optional (version == "3.9.1") [
     ./0001-Syntax-highlight-nix.patch
     ./0002-Syntax-highlight-rules.pl.patch
     ./0003-Add-titles-to-CLs-over-HTTP.patch
@@ -51,7 +45,7 @@ buildBazelPackage {
   fetchConfigured = true;
 
   fetchAttrs = {
-    sha256 = "sha256-rsYQR6/RO5NM3/fnB3lEmbz876B59QWxWpE3M/Z4rK4=";
+    sha256 = fetchHash;
     preBuild = ''
       rm .bazelversion
     '';
diff --git a/pkgs/gerrit_plugins/builder.nix b/pkgs/gerrit_plugins/builder.nix
index 299b208..d021034 100644
--- a/pkgs/gerrit_plugins/builder.nix
+++ b/pkgs/gerrit_plugins/builder.nix
@@ -9,6 +9,8 @@
   , patches ? [ ]
 }: (buildGerrit {
     name = "${name}.jar";
+    version = gerrit.version;
+    fetchHash = gerrit.fetchAttrs.sha256;
 
     src = runCommandLocal "${name}-src" { } ''
       cp -R "${gerrit.src}" "$out"
diff --git a/services/gerrit/default.nix b/services/gerrit/default.nix
index 44ca7ae..e111b27 100644
--- a/services/gerrit/default.nix
+++ b/services/gerrit/default.nix
@@ -58,7 +58,7 @@ in
         oauth
       ];
 
-      package = pkgs.gerrit;
+      package = pkgs.gerrit_3_10;
 
       jvmHeapLimit = "32g";
 
-- 
2.44.1