Compare commits
2 commits
Author | SHA1 | Date | |
---|---|---|---|
Linus Heckemann | d02e37c43a | ||
Linus Heckemann | e5901efdb3 |
|
@ -4,6 +4,7 @@
|
||||||
{ buildBazelPackageNG
|
{ buildBazelPackageNG
|
||||||
, lib
|
, lib
|
||||||
, fetchgit
|
, fetchgit
|
||||||
|
, fetchpatch2
|
||||||
, bazel_7
|
, bazel_7
|
||||||
, python3
|
, python3
|
||||||
, openjdk21_headless
|
, openjdk21_headless
|
||||||
|
@ -17,7 +18,7 @@ let
|
||||||
in
|
in
|
||||||
(buildBazelPackageNG rec {
|
(buildBazelPackageNG rec {
|
||||||
pname = "gerrit";
|
pname = "gerrit";
|
||||||
version = "3.10.0";
|
version = "3.10.2";
|
||||||
|
|
||||||
bazel = bazel_7;
|
bazel = bazel_7;
|
||||||
|
|
||||||
|
@ -26,7 +27,7 @@ in
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
deepClone = true;
|
deepClone = true;
|
||||||
hash = "sha256-FpKuzityHuHNYBIOL8YUjCLlkuVBfxjvHECb26NsZNE=";
|
hash = "sha256-sTiPNgE/XqqqgBraglc9v+LSSWLUsXnAmZEEi+Tki58=";
|
||||||
}).overrideAttrs (_: {
|
}).overrideAttrs (_: {
|
||||||
env.NIX_PREFETCH_GIT_CHECKOUT_HOOK = ''
|
env.NIX_PREFETCH_GIT_CHECKOUT_HOOK = ''
|
||||||
pushd "$dir" >/dev/null
|
pushd "$dir" >/dev/null
|
||||||
|
@ -38,14 +39,18 @@ in
|
||||||
find "$dir" -name .git -print0 | xargs -0 rm -rf
|
find "$dir" -name .git -print0 | xargs -0 rm -rf
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
depsHash = "sha256-mp2RhOvDh+0CeLQhCjPp57N2QB816k4AWMeAhvU2u38=";
|
depsHash = "sha256-oiOucsKRvhms+AwMy6VZF/zWCVmSScuyc3T2Gg2Qz7w=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./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
|
||||||
|
|
||||||
./gerrit-cl-431977-bump-sshd.patch
|
(fetchpatch2 {
|
||||||
|
url = "https://gerrit-review.googlesource.com/changes/gerrit~438881/revisions/2/patch?download";
|
||||||
|
decode = "base64 -d";
|
||||||
|
hash = "sha256-x0j/bPuDTQ/eVd2YleSVREp0DBSd+9SFcvFlucp7fXg=";
|
||||||
|
})
|
||||||
./gerrit-cl-431977-part-2-bump-bouncycastle.patch
|
./gerrit-cl-431977-part-2-bump-bouncycastle.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
Bump SSHD version to 2.13.1
|
|
||||||
|
|
||||||
Release-Notes: Update SSHD version to 2.13.1
|
|
||||||
Change-Id: Ib7bc185bfd9e7eda0cc04230da8bd87ee1bb2358
|
|
||||||
|
|
||||||
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
|
|
||||||
index 91caf31..d9b90d8 100644
|
|
||||||
--- a/tools/nongoogle.bzl
|
|
||||||
+++ b/tools/nongoogle.bzl
|
|
||||||
@@ -137,18 +137,18 @@
|
|
||||||
sha1 = "cb2f351bf4463751201f43bb99865235d5ba07ca",
|
|
||||||
)
|
|
||||||
|
|
||||||
- SSHD_VERS = "2.12.0"
|
|
||||||
+ SSHD_VERS = "2.13.1"
|
|
||||||
|
|
||||||
maven_jar(
|
|
||||||
name = "sshd-osgi",
|
|
||||||
artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
|
|
||||||
- sha1 = "32b8de1cbb722ba75bdf9898e0c41d42af00ce57",
|
|
||||||
+ sha1 = "50958cc44076749e790d7332021cff546707624c",
|
|
||||||
)
|
|
||||||
|
|
||||||
maven_jar(
|
|
||||||
name = "sshd-sftp",
|
|
||||||
artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
|
|
||||||
- sha1 = "0f96f00a07b186ea62838a6a4122e8f4cad44df6",
|
|
||||||
+ sha1 = "e1b6da4ef604718e32cad59ef32618610da7a170",
|
|
||||||
)
|
|
||||||
|
|
||||||
maven_jar(
|
|
||||||
@@ -166,7 +166,7 @@
|
|
||||||
maven_jar(
|
|
||||||
name = "sshd-mina",
|
|
||||||
artifact = "org.apache.sshd:sshd-mina:" + SSHD_VERS,
|
|
||||||
- sha1 = "8b202f7d4c0d7b714fd0c93a1352af52aa031149",
|
|
||||||
+ sha1 = "ff4a9fac41a111d806f6a058d23278b0819da7ce",
|
|
||||||
)
|
|
||||||
|
|
||||||
maven_jar(
|
|
Loading…
Reference in a new issue