From 024c463afac24a7ccccc61d3e4696775c3821d45 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 21 Jul 2025 18:41:50 +0200 Subject: [PATCH 1/2] pack: switch to `finalAttrs` pattern --- pkgs/by-name/pa/pack/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix index 9324880d9555..8aba6bdefce1 100644 --- a/pkgs/by-name/pa/pack/package.nix +++ b/pkgs/by-name/pa/pack/package.nix @@ -7,14 +7,14 @@ pack, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "pack"; version = "0.37.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0="; }; @@ -25,7 +25,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/buildpacks/pack.Version=${version}" + "-X github.com/buildpacks/pack.Version=${finalAttrs.version}" ]; passthru = { @@ -40,4 +40,4 @@ buildGoModule rec { mainProgram = "pack"; maintainers = with lib.maintainers; [ drupol ]; }; -} +}) From 3870c96afa37077ae9c50e8c49cce56e3c3e91bf Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 21 Jul 2025 18:42:58 +0200 Subject: [PATCH 2/2] pack: 0.37.0 -> 0.38.2 --- pkgs/by-name/pa/pack/package.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix index 8aba6bdefce1..1ac1d813cbf5 100644 --- a/pkgs/by-name/pa/pack/package.nix +++ b/pkgs/by-name/pa/pack/package.nix @@ -3,36 +3,43 @@ buildGoModule, fetchFromGitHub, nix-update-script, - testers, - pack, + versionCheckHook, + writableTmpDirAsHomeHook, }: buildGoModule (finalAttrs: { pname = "pack"; - version = "0.37.0"; + version = "0.38.2"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; tag = "v${finalAttrs.version}"; - hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0="; + hash = "sha256-JDvNG0HMwr/bbWbuSLwuC5y+ZePECW4u+dzMBcKrcNk="; }; - vendorHash = "sha256-W8FTk2eJYaTE9gCRwrT+mDhda/ZZeCytqQ9vvVZZHSQ="; + subPackages = [ "." ]; - subPackages = [ "cmd/pack" ]; + vendorHash = "sha256-PvGoHJP+MsfidKz72qFx638x+uirhgckIKCBdTUrqB8="; ldflags = [ "-s" "-w" - "-X github.com/buildpacks/pack.Version=${finalAttrs.version}" + "-X github.com/buildpacks/pack/pkg/client.Version=${finalAttrs.version}" ]; passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = pack; }; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "--version"; + versionCheckKeepEnvironment = [ "HOME" ]; + meta = { description = "CLI for building apps using Cloud Native Buildpacks"; homepage = "https://github.com/buildpacks/pack/";