velocity: 3.5.0-unstable-2026-07-10 -> 4.1.0-unstable-2026-08-03 (#551301)

This commit is contained in:
Peder Bergebakken Sundt
2026-08-12 15:43:34 +00:00
committed by GitHub
2 changed files with 529 additions and 449 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -2,13 +2,12 @@
lib,
stdenv,
fetchFromGitHub,
gradle,
jdk17,
jdk21,
gradle_9,
jdk25,
makeBinaryWrapper,
openssl,
libdeflate,
jre_headless,
jdk25_headless,
writeScript,
nixosTests,
@@ -19,7 +18,6 @@
],
}:
let
gradle_jdk17 = gradle.override { javaToolchains = [ jdk17 ]; };
velocityNativePlatform =
{
x86_64-linux = "linux_x86_64";
@@ -34,17 +32,17 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "velocity";
version = "3.5.0-unstable-2026-07-10";
version = "4.1.0-unstable-2026-08-03";
src = fetchFromGitHub {
owner = "PaperMC";
repo = "Velocity";
rev = "97b386d86ff99f787117cb30e8a4b50c83dba6c2";
hash = "sha256-EzoR12YsXP0F7n1ifk/Eg16S//pmYnRpSiO7qkerBes=";
rev = "00759e52790e85e148efc08adb7e7dd29e6c5110";
hash = "sha256-D9r4OyVfeLNzbEklUdWJ7vEqRsZ9ja5AanqeerdFJck=";
};
nativeBuildInputs = [
gradle_jdk17
gradle_9
makeBinaryWrapper
];
@@ -54,16 +52,22 @@ stdenv.mkDerivation (finalAttrs: {
libdeflate
# needed for building velocity-native jni
jdk21
jdk25
];
strictDeps = true;
mitmCache = gradle_jdk17.fetchDeps {
mitmCache = gradle_9.fetchDeps {
inherit (finalAttrs) pname;
data = ./deps.json;
};
gradleUpdateScript = ''
runHook preBuild
gradle --write-verification-metadata sha256
'';
patches = [
./fix-version.patch # remove build-time dependency on git and use version string from a env var instead
./disable-javadocs.patch # disable building java docs because they cause build failures
@@ -97,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $out/bin $out/share/velocity
cp proxy/build/libs/velocity-proxy-${builtins.head (builtins.split "-" finalAttrs.version)}-SNAPSHOT-all.jar $out/share/velocity/velocity.jar
makeWrapper ${lib.getExe jre_headless} "$out/bin/velocity" \
makeWrapper ${lib.getExe jdk25_headless} "$out/bin/velocity" \
--append-flags "-jar $out/share/velocity/velocity.jar"
${lib.optionalString withVelocityNative ''