From b986c4fd2899033626c411c6aa69008e7a6d8864 Mon Sep 17 00:00:00 2001 From: Artem Leshchev Date: Mon, 13 Apr 2026 16:11:42 -0500 Subject: [PATCH 1/3] s5cmd: inject version in the binary Make s5cmd version output the right version. It is also supposed to output the git commit hash, but I'm not sure how to get it in a sane way. --- pkgs/by-name/s5/s5cmd/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/s5/s5cmd/package.nix b/pkgs/by-name/s5/s5cmd/package.nix index 28614a5a4ded..866de467bdde 100644 --- a/pkgs/by-name/s5/s5cmd/package.nix +++ b/pkgs/by-name/s5/s5cmd/package.nix @@ -17,6 +17,8 @@ buildGoModule (finalAttrs: { vendorHash = null; + ldflags = [ "-X github.com/peak/s5cmd/v2/version.Version=v${finalAttrs.version}" ]; + # Skip e2e tests requiring network access excludedPackages = [ "./e2e" ]; From 5429a4f056308d2d9ac49c66b5b00d09a7900cb5 Mon Sep 17 00:00:00 2001 From: Artem Leshchev Date: Mon, 13 Apr 2026 16:12:58 -0500 Subject: [PATCH 2/3] s5cmd: fix build with macOS sandbox --- pkgs/by-name/s5/s5cmd/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/s5/s5cmd/package.nix b/pkgs/by-name/s5/s5cmd/package.nix index 866de467bdde..11744dc11fe3 100644 --- a/pkgs/by-name/s5/s5cmd/package.nix +++ b/pkgs/by-name/s5/s5cmd/package.nix @@ -22,6 +22,9 @@ buildGoModule (finalAttrs: { # Skip e2e tests requiring network access excludedPackages = [ "./e2e" ]; + # Fix tests creating network sockets on macOS + __darwinAllowLocalNetworking = true; + meta = { homepage = "https://github.com/peak/s5cmd"; description = "Parallel S3 and local filesystem execution tool"; From c63e6ea540a5e91676119827133c62908e30d154 Mon Sep 17 00:00:00 2001 From: Artem Leshchev Date: Mon, 13 Apr 2026 16:16:50 -0500 Subject: [PATCH 3/3] s5cmd: add versionCheckHook In case the required ldflags option will change, this hook will catch that. --- pkgs/by-name/s5/s5cmd/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/s5/s5cmd/package.nix b/pkgs/by-name/s5/s5cmd/package.nix index 11744dc11fe3..fbd0fa11d0f8 100644 --- a/pkgs/by-name/s5/s5cmd/package.nix +++ b/pkgs/by-name/s5/s5cmd/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule (finalAttrs: { @@ -25,6 +26,10 @@ buildGoModule (finalAttrs: { # Fix tests creating network sockets on macOS __darwinAllowLocalNetworking = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = [ "version" ]; + meta = { homepage = "https://github.com/peak/s5cmd"; description = "Parallel S3 and local filesystem execution tool";