From d130d6d69f1b80b68434d72bcf461b8ea4209bdc Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 10 Jul 2025 11:40:26 +0800 Subject: [PATCH 1/3] yq-go: add updateScript --- pkgs/by-name/yq/yq-go/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index 8f17ea5b3977..2f0cd1f882d1 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -6,6 +6,7 @@ installShellFiles, runCommand, yq-go, + nix-update-script, }: buildGoModule (finalAttrs: { @@ -30,11 +31,14 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/yq shell-completion zsh) ''; - passthru.tests = { - simple = runCommand "${finalAttrs.pname}-test" { } '' - echo "test: 1" | ${yq-go}/bin/yq eval -j > $out - [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ] - ''; + passthru = { + tests = { + simple = runCommand "${finalAttrs.pname}-test" { } '' + echo "test: 1" | ${yq-go}/bin/yq eval -j > $out + [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ] + ''; + }; + updateScript = nix-update-script { }; }; meta = { From 82fca8f3361328463d3c29d445c503b184f1f95b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 10 Jul 2025 11:41:51 +0800 Subject: [PATCH 2/3] yq-go: 4.45.4 -> 4.46.1 --- pkgs/by-name/yq/yq-go/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index 2f0cd1f882d1..eea67ec76472 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "yq-go"; - version = "4.45.4"; + version = "4.46.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; - rev = "v${finalAttrs.version}"; - hash = "sha256-qcsm7dB7F7Snul2PbH/7RdK17c5qT+mk+FvfqnFfuak="; + tag = "v${finalAttrs.version}"; + hash = "sha256-lMmcqAe1A/ET/2Dju6Gj0+I/g4z23EmtuRio0NYTHws="; }; - vendorHash = "sha256-cA5Y0/2lvYfVXr4zgtp/U8aBUkHnh9xb9jDHVk/2OME="; + vendorHash = "sha256-wfn8u8I4dyAD4PbeiQGSai1gQ2ZDFBi2mysZVKa0mkA="; nativeBuildInputs = [ installShellFiles ]; @@ -44,7 +44,7 @@ buildGoModule (finalAttrs: { meta = { description = "Portable command-line YAML processor"; homepage = "https://mikefarah.gitbook.io/yq/"; - changelog = "https://github.com/mikefarah/yq/raw/v${finalAttrs.version}/release_notes.txt"; + changelog = "https://github.com/mikefarah/yq/raw/${finalAttrs.src.tag}/release_notes.txt"; mainProgram = "yq"; license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ From a3932b626d4c852643f9933487deb47dd099cbee Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 10 Jul 2025 11:42:32 +0800 Subject: [PATCH 3/3] yq-go: use finalAttrs.finalPackage --- pkgs/by-name/yq/yq-go/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index eea67ec76472..2703d396ba0e 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, installShellFiles, runCommand, - yq-go, nix-update-script, }: @@ -33,8 +32,8 @@ buildGoModule (finalAttrs: { passthru = { tests = { - simple = runCommand "${finalAttrs.pname}-test" { } '' - echo "test: 1" | ${yq-go}/bin/yq eval -j > $out + simple = runCommand "yq-go-test" { } '' + echo "test: 1" | ${finalAttrs.finalPackage}/bin/yq eval -j > $out [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ] ''; };