From 9700c8f700f6c57c92a19744a2554ba045fe5af3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 17:02:19 +0000 Subject: [PATCH 1/2] yamlfmt: 0.13.0 -> 0.14.0 --- pkgs/development/tools/yamlfmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 0287fd6f8bd8..4798a5488fcc 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yamlfmt"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI="; + hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI="; }; - vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; + vendorHash = "sha256-lsNldfacBoeTPyhkjyDZhI5YR+kDke0TarfG/KdjEOg="; ldflags = [ "-s" From 91774627c2d863c196f13972ac04c40ff8218d49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 09:38:50 +0100 Subject: [PATCH 2/2] yamlfmt: refactor --- pkgs/development/tools/yamlfmt/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 4798a5488fcc..039e54c1b130 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }: +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + yamlfmt, +}: buildGoModule rec { pname = "yamlfmt"; @@ -6,8 +12,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "v${version}"; + repo = "yamlfmt"; + rev = "refs/tags/v${version}"; hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI="; }; @@ -16,8 +22,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" - "-X main.commit=${src.rev}" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" ]; passthru.tests.version = testers.testVersion { @@ -27,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Extensible command line tool or library to format yaml files"; homepage = "https://github.com/google/yamlfmt"; + changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ sno2wman ]; mainProgram = "yamlfmt";