From 10f864f976bd38cba41ab685156b6b17b32833ac Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 19 Jun 2026 00:15:47 +0800 Subject: [PATCH 1/4] roadrunner: fix ldflags, add versionCheckHook --- pkgs/by-name/ro/roadrunner/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index c5460e59b7b8..c5016eaaddb8 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/pkgs/by-name/ro/roadrunner/package.nix @@ -4,6 +4,7 @@ buildGoModule, fetchFromGitHub, installShellFiles, + versionCheckHook, }: buildGoModule (finalAttrs: { @@ -22,11 +23,11 @@ buildGoModule (finalAttrs: { ]; # Flags as provided by the build automation of the project: - # https://github.com/roadrunner-server/roadrunner/blob/fe572d0eceae8fd05225fbd99ba50a9eb10c4393/.github/workflows/release.yml#L89 + # https://github.com/roadrunner-server/roadrunner/blob/3853ad693522e82d53d62950e5f1315402c910f2/.github/workflows/release.yml#L82 ldflags = [ "-s" - "-X=github.com/roadrunner-server/roadrunner/v2023/internal/meta.version=${finalAttrs.version}" - "-X=github.com/roadrunner-server/roadrunner/v2023/internal/meta.buildTime=1970-01-01T00:00:00Z" + "-X=github.com/roadrunner-server/roadrunner/v${lib.versions.major finalAttrs.version}/internal/meta.version=${finalAttrs.version}" + "-X=github.com/roadrunner-server/roadrunner/v${lib.versions.major finalAttrs.version}/internal/meta.buildTime=1970-01-01T00:00:00Z" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -51,6 +52,9 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-LSeQACVgBywJqHfRE2q6HxL1ADKZtrJP83U3Zd1oIDw="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "High-performance PHP application server, process manager written in Go and powered with plugins"; From 22e84a648a82e2e3e5b73389528e91f38727258d Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 19 Jun 2026 00:31:14 +0800 Subject: [PATCH 2/4] roadrunner: 2025.1.6 -> 2025.1.14 --- pkgs/by-name/ro/roadrunner/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index c5016eaaddb8..108c83e54386 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/pkgs/by-name/ro/roadrunner/package.nix @@ -9,18 +9,19 @@ buildGoModule (finalAttrs: { pname = "roadrunner"; - version = "2025.1.6"; + version = "2025.1.14"; src = fetchFromGitHub { - repo = "roadrunner"; owner = "roadrunner-server"; + repo = "roadrunner"; tag = "v${finalAttrs.version}"; - hash = "sha256-qoPQxJbZ1BH9Gy06qmp9LGWF6YPJL0gRZX3+S5ej6XY="; + hash = "sha256-0Mfu/De28tWCygJ5/QJnOzxk88aajx4Oq/Xm0TOXR0M="; }; - nativeBuildInputs = [ - installShellFiles - ]; + vendorHash = "sha256-KuATz7rVsDuGiyILvILaEpznI63sCHx0G+9D2vR+dx0="; + env.GOWORK = "off"; + + subPackages = [ "cmd/rr" ]; # Flags as provided by the build automation of the project: # https://github.com/roadrunner-server/roadrunner/blob/3853ad693522e82d53d62950e5f1315402c910f2/.github/workflows/release.yml#L82 @@ -30,6 +31,10 @@ buildGoModule (finalAttrs: { "-X=github.com/roadrunner-server/roadrunner/v${lib.versions.major finalAttrs.version}/internal/meta.buildTime=1970-01-01T00:00:00Z" ]; + nativeBuildInputs = [ + installShellFiles + ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd rr \ --bash <($out/bin/rr completion bash) \ @@ -50,8 +55,6 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; - vendorHash = "sha256-LSeQACVgBywJqHfRE2q6HxL1ADKZtrJP83U3Zd1oIDw="; - doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 4586720308e594153d582cc8777aecab8baae83f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 19 Jun 2026 00:34:01 +0800 Subject: [PATCH 3/4] roadrunner: remove obsolete patch --- pkgs/by-name/ro/roadrunner/package.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index 108c83e54386..9df0b8e6c3fd 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/pkgs/by-name/ro/roadrunner/package.nix @@ -42,17 +42,6 @@ buildGoModule (finalAttrs: { --fish <($out/bin/rr completion fish) ''; - postPatch = '' - substituteInPlace internal/rpc/client_test.go \ - --replace "127.0.0.1:55555" "127.0.0.1:55554" - - substituteInPlace internal/rpc/test/config_rpc_ok.yaml \ - --replace "127.0.0.1:55555" "127.0.0.1:55554" - - substituteInPlace internal/rpc/test/config_rpc_conn_err.yaml \ - --replace "127.0.0.1:0" "127.0.0.1:55554" - ''; - __darwinAllowLocalNetworking = true; doInstallCheck = true; From 728a0645abef307ced95a452d9ffd96d80a98035 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 19 Jun 2026 13:06:27 +0800 Subject: [PATCH 4/4] roadrunner: add myself as maintainer --- pkgs/by-name/ro/roadrunner/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index 9df0b8e6c3fd..bd387347db8f 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/pkgs/by-name/ro/roadrunner/package.nix @@ -53,6 +53,6 @@ buildGoModule (finalAttrs: { homepage = "https://roadrunner.dev"; license = lib.licenses.mit; mainProgram = "rr"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ moraxyc ]; }; })