Unverified Commit c4b29de3 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

velocity: 3.4.0-unstable-2025-06-11 -> 3.4.0-unstable-2025-08-02 (#419229)

parents ed467ca0 608f2606
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@
          (mkVelocityService "velocity-with-native" (pkgs.velocity.override { withVelocityNative = true; }))
        ];

      environment.systemPackages = [ pkgs.mcstatus ];
      environment.systemPackages = [ (pkgs.python3.withPackages (p: [ p.mcstatus ])) ];
    };

  testScript = ''
@@ -50,7 +50,7 @@
      server.wait_until_succeeds(f"journalctl -b -u {name} | grep -q -E '{connections_startup_query}'")
      server.wait_until_succeeds(f"journalctl -b -u {name} | grep -q 'Done ([0-9]*.[0-9]*s)!'");

      _, status_result = server.execute("mcstatus localhost:25565 status")
      _, status_result = server.execute("python -m mcstatus localhost:25565 status")
      assert "A Velocity Server" in status_result

      server.execute(f"echo stop > /run/{name}.stdin")
+316 −240

File changed.

Preview size limit exceeded, changes collapsed.

+7 −6
Original line number Diff line number Diff line
--- a/build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts
+++ b/build-logic/src/main/kotlin/velocity-init-manifest.gradle.kts
@@ -2,28 +2,9 @@ import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.withType
 import java.io.ByteArrayOutputStream
@@ -8,29 +8,10 @@ interface Injected {
     val execOps: ExecOperations
 }
 
-val currentShortRevision = ByteArrayOutputStream().use {
-    exec {
-    val execOps = objects.newInstance<Injected>().execOps
-    execOps.exec {
-        executable = "git"
-        args = listOf("rev-parse", "HEAD")
-        standardOutput = it
@@ -15,7 +16,7 @@
-
 tasks.withType<Jar> {
     manifest {
-        val buildNumber = System.getenv("BUILD_NUMBER")
         val buildNumber = System.getenv("BUILD_NUMBER")
-        val velocityHumanVersion: String =
-            if (project.version.toString().endsWith("-SNAPSHOT")) {
-                if (buildNumber == null) {
@@ -26,7 +27,7 @@
-            } else {
-                archiveVersion.get()
-            }
+        val velocityHumanVersion = System.getenv("BUILD_VERSION")
+        val velocityHumanVersion = System.getenv("BUILD_VERSION");
         attributes["Implementation-Version"] = velocityHumanVersion
     }
 }
+3 −3
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "velocity";
  version = "3.4.0-unstable-2025-06-11";
  version = "3.4.0-unstable-2025-08-02";

  src = fetchFromGitHub {
    owner = "PaperMC";
    repo = "Velocity";
    rev = "669fda298c670c55686f34d868383052b192518d";
    hash = "sha256-UI6SqVAaM4NANf9cGvsIgYO1jSkWDOk5ysyufrPWTgg=";
    rev = "d47848cb93a5f94a95059c2794c0197df6360f29";
    hash = "sha256-bCvUXWv4rdoZEU1GpVSlXROC9kBtSGisvmCgRPKVZ4o=";
  };

  nativeBuildInputs = [