From d15899f11707c6fa4ba0f8dff0adc47c9513cca0 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 5 Apr 2026 20:25:43 +0700 Subject: [PATCH] boulder: use finalAttrs --- pkgs/by-name/bo/boulder/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/bo/boulder/package.nix b/pkgs/by-name/bo/boulder/package.nix index 90fa843293e5..f51c83dc40d5 100644 --- a/pkgs/by-name/bo/boulder/package.nix +++ b/pkgs/by-name/bo/boulder/package.nix @@ -3,19 +3,18 @@ fetchFromGitHub, buildGoModule, testers, - boulder, minica, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "boulder"; version = "0.20260331.0"; src = fetchFromGitHub { owner = "letsencrypt"; repo = "boulder"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; leaveDotGit = true; postFetch = '' pushd $out @@ -44,7 +43,7 @@ buildGoModule rec { ]; preBuild = '' - ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${version} +$(cat COMMIT)\"" + ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${finalAttrs.version} +$(cat COMMIT)\"" ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u -d @0)\"" ''; @@ -330,7 +329,7 @@ buildGoModule rec { ]; checkFlags = [ - "-skip ${lib.strings.concatStringsSep "|" disabledTests}" + "-skip ${lib.strings.concatStringsSep "|" finalAttrs.disabledTests}" ]; postInstall = '' @@ -341,8 +340,8 @@ buildGoModule rec { passthru = { tests.version = testers.testVersion { - package = boulder; - inherit version; + package = finalAttrs.finalPackage; + version = finalAttrs.version; }; updateScript = nix-update-script { }; }; @@ -361,4 +360,4 @@ buildGoModule rec { mainProgram = "boulder"; maintainers = [ ]; }; -} +})