pkgs/gerrit: upgrade to 3.10.0
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
This commit is contained in:
parent
e148d54b18
commit
5d8618deff
|
@ -1,6 +1,29 @@
|
||||||
self: super: {
|
self: super: {
|
||||||
buildGerrit = self.callPackage ../pkgs/gerrit { };
|
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 {
|
buildGerritBazelPlugin = self.callPackage ../pkgs/gerrit_plugins/builder.nix {
|
||||||
inherit (self) buildGerrit;
|
inherit (self) buildGerrit;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
{ buildFHSUserEnv, writeShellScriptBin, buildBazelPackage, fetchgit, unzip }:
|
{ buildFHSUserEnv, writeShellScriptBin, buildBazelPackage, fetchgit, unzip, lib }:
|
||||||
{ name ? "gerrit-${version}", version ? "3.9.1", src ? (fetchgit {
|
{ name, version, src, fetchHash, bazelTargets ? [ "release" "api-skip-javadoc" ]
|
||||||
url = "https://gerrit.googlesource.com/gerrit";
|
|
||||||
rev = "620a819cbf3c64fff7a66798822775ad42c91d8e";
|
|
||||||
branchName = "v${version}";
|
|
||||||
sha256 = "sha256:1mdxbgnx3mpxand4wq96ic38bb4yh45q271h40jrk7dk23sgmz02";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
}), bazelTargets ? [ "release" "api-skip-javadoc" ]
|
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
bazelRunScript = writeShellScriptBin "bazel-run" ''
|
bazelRunScript = writeShellScriptBin "bazel-run" ''
|
||||||
|
@ -34,7 +28,7 @@ in
|
||||||
buildBazelPackage {
|
buildBazelPackage {
|
||||||
inherit name version src;
|
inherit name version src;
|
||||||
|
|
||||||
patches = [
|
patches = lib.optional (version == "3.9.1") [
|
||||||
./0001-Syntax-highlight-nix.patch
|
./0001-Syntax-highlight-nix.patch
|
||||||
./0002-Syntax-highlight-rules.pl.patch
|
./0002-Syntax-highlight-rules.pl.patch
|
||||||
./0003-Add-titles-to-CLs-over-HTTP.patch
|
./0003-Add-titles-to-CLs-over-HTTP.patch
|
||||||
|
@ -51,7 +45,7 @@ buildBazelPackage {
|
||||||
fetchConfigured = true;
|
fetchConfigured = true;
|
||||||
|
|
||||||
fetchAttrs = {
|
fetchAttrs = {
|
||||||
sha256 = "sha256-rsYQR6/RO5NM3/fnB3lEmbz876B59QWxWpE3M/Z4rK4=";
|
sha256 = fetchHash;
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
rm .bazelversion
|
rm .bazelversion
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
, patches ? [ ]
|
, patches ? [ ]
|
||||||
}: (buildGerrit {
|
}: (buildGerrit {
|
||||||
name = "${name}.jar";
|
name = "${name}.jar";
|
||||||
|
version = gerrit.version;
|
||||||
|
fetchHash = gerrit.fetchAttrs.sha256;
|
||||||
|
|
||||||
src = runCommandLocal "${name}-src" { } ''
|
src = runCommandLocal "${name}-src" { } ''
|
||||||
cp -R "${gerrit.src}" "$out"
|
cp -R "${gerrit.src}" "$out"
|
||||||
|
|
|
@ -58,7 +58,7 @@ in
|
||||||
oauth
|
oauth
|
||||||
];
|
];
|
||||||
|
|
||||||
package = pkgs.gerrit;
|
package = pkgs.gerrit_3_10;
|
||||||
|
|
||||||
jvmHeapLimit = "32g";
|
jvmHeapLimit = "32g";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue