From 0d9f54e2b5567420992487704b46c48cacc52beb Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 29 Nov 2025 19:18:14 +0000 Subject: [PATCH 1/4] oha: Use finalAttrs --- pkgs/by-name/oh/oha/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 41f9058414fc..54a74f26c943 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -8,14 +8,14 @@ rust-jemalloc-sys, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "oha"; version = "1.11.0"; src = fetchFromGitHub { owner = "hatoo"; repo = "oha"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N52j8WYEVlmHQdr0HZJZZo92OhIz4V0R1SdaWlOD684="; }; @@ -36,9 +36,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "HTTP load generator inspired by rakyll/hey with tui animation"; homepage = "https://github.com/hatoo/oha"; - changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/hatoo/oha/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "oha"; }; -} +}) From 6908641943e7c74af53f9786cd96ece591df39ed Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 29 Nov 2025 19:20:50 +0000 Subject: [PATCH 2/4] oha: Add versionCheckHook --- pkgs/by-name/oh/oha/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 54a74f26c943..72e0880daf9b 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -6,6 +6,7 @@ pkg-config, openssl, rust-jemalloc-sys, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -33,6 +34,11 @@ rustPlatform.buildRustPackage (finalAttrs: { # tests don't work inside the sandbox doCheck = false; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = { description = "HTTP load generator inspired by rakyll/hey with tui animation"; homepage = "https://github.com/hatoo/oha"; From 2879aa696ea49ecefd4189ac93cff7d12a1e6775 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 29 Nov 2025 19:33:05 +0000 Subject: [PATCH 3/4] oha: Enable LTO per upstream release-ci profile --- pkgs/by-name/oh/oha/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 72e0880daf9b..05595b6c9a3c 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -22,6 +22,9 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-M6wJy5X9JRM9tOOGT8b6YIUT0OakXQxjw17iuqaRT5s="; + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; From d17ca8c82fa08a1ce1b04fda1a33ad4728d6d797 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 29 Nov 2025 19:33:25 +0000 Subject: [PATCH 4/4] oha: Adopt package as maintainer --- pkgs/by-name/oh/oha/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 05595b6c9a3c..6cbd718eb848 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/hatoo/oha"; changelog = "https://github.com/hatoo/oha/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.jpds ]; mainProgram = "oha"; }; })