From 56a2b288169afdf3e1ee479de98923b0495a1ab6 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 27 Dec 2025 23:39:36 +0100 Subject: [PATCH 1/3] age: add updateScript --- pkgs/by-name/ag/age/package.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix index 7313555ba269..a7b64e71b598 100644 --- a/pkgs/by-name/ag/age/package.nix +++ b/pkgs/by-name/ag/age/package.nix @@ -12,6 +12,7 @@ age-plugin-1p, makeWrapper, runCommand, + nix-update-script, }: buildGoModule (final: { @@ -33,9 +34,7 @@ buildGoModule (final: { "-X main.Version=${final.version}" ]; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; preInstall = '' installManPage doc/*.1 @@ -73,14 +72,12 @@ buildGoModule (final: { # convenience function for wrapping sops with plugins passthru.withPlugins = filter: - runCommand "age-${final.version}-with-plugins" - { - nativeBuildInputs = [ makeWrapper ]; - } - '' - makeWrapper ${lib.getBin final.finalPackage}/bin/age $out/bin/age \ - --prefix PATH : "${lib.makeBinPath (filter final.passthru.plugins)}" - ''; + runCommand "age-${final.version}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; } '' + makeWrapper ${lib.getBin final.finalPackage}/bin/age $out/bin/age \ + --prefix PATH : "${lib.makeBinPath (filter final.passthru.plugins)}" + ''; + + passthru.updateScript = nix-update-script { }; meta = { changelog = "https://github.com/FiloSottile/age/releases/tag/v${final.version}"; From 108bd7282b38a911fb42d92e7c00f3d8a3f32076 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 27 Dec 2025 23:40:22 +0100 Subject: [PATCH 2/3] age: use versionCheckHook --- pkgs/by-name/ag/age/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix index a7b64e71b598..1b7fb1058aa1 100644 --- a/pkgs/by-name/ag/age/package.nix +++ b/pkgs/by-name/ag/age/package.nix @@ -12,6 +12,7 @@ age-plugin-1p, makeWrapper, runCommand, + versionCheckHook, nix-update-script, }: @@ -40,15 +41,9 @@ buildGoModule (final: { installManPage doc/*.1 ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; - installCheckPhase = '' - if [[ "$("$out/bin/${final.pname}" --version)" == "${final.version}" ]]; then - echo '${final.pname} smoke check passed' - else - echo '${final.pname} smoke check failed' - return 1 - fi - ''; # plugin test is flaky, see https://github.com/FiloSottile/age/issues/517 checkFlags = [ From d3d6406638bab53bf5d1f4c3a432798365a44b64 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 27 Dec 2025 22:41:22 +0000 Subject: [PATCH 3/3] age: 1.2.1 -> 1.3.1 Changelog: https://github.com/FiloSottile/age/releases/tag/v1.3.0 Changelog: https://github.com/FiloSottile/age/releases/tag/v1.3.1 Diff: https://github.com/FiloSottile/age/compare/v1.2.1...v1.3.1 --- pkgs/by-name/ag/age/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix index 1b7fb1058aa1..9ac09fee82be 100644 --- a/pkgs/by-name/ag/age/package.nix +++ b/pkgs/by-name/ag/age/package.nix @@ -18,21 +18,21 @@ buildGoModule (final: { pname = "age"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; tag = "v${final.version}"; - hash = "sha256-9ZJdrmqBj43zSvStt0r25wjSfnvitdx3GYtM3urHcaA="; + hash = "sha256-Qs/q3zQYV0PukABBPf/aU5V1oOhw95NG6K301VYJk8A="; }; - vendorHash = "sha256-ilRLEV7qOBZbqzg2XQi4kt0JAb/1ftT4JmahYT0zSRU="; + vendorHash = "sha256-iVDkYXXR2pXlUVywPgVRNMORxOOEhAmzpSM0xqSQMSQ="; ldflags = [ "-s" "-w" - "-X main.Version=${final.version}" + "-X main.Version=v${final.version}" ]; nativeBuildInputs = [ installShellFiles ];