From 99bcd6175358aaead2dc514128a92f5adc36a235 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 23 Nov 2024 10:57:36 +0800 Subject: [PATCH 1/2] txtpbfmt: format with nixfmt --- pkgs/by-name/tx/txtpbfmt/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tx/txtpbfmt/package.nix b/pkgs/by-name/tx/txtpbfmt/package.nix index 88c04d5803f8..1831a367c98e 100644 --- a/pkgs/by-name/tx/txtpbfmt/package.nix +++ b/pkgs/by-name/tx/txtpbfmt/package.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule { pname = "txtpbfmt"; @@ -13,7 +17,10 @@ buildGoModule { vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { description = "Formatter for text proto files"; From f6f10a28199d509ec43996e04be73c2e77f35b9f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 23 Nov 2024 11:02:37 +0800 Subject: [PATCH 2/2] txtpbfmt: 0-unstable-2024-06-11 -> 0-unstable-2024-11-12 --- pkgs/by-name/tx/txtpbfmt/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/tx/txtpbfmt/package.nix b/pkgs/by-name/tx/txtpbfmt/package.nix index 1831a367c98e..3e2dba38d412 100644 --- a/pkgs/by-name/tx/txtpbfmt/package.nix +++ b/pkgs/by-name/tx/txtpbfmt/package.nix @@ -2,17 +2,18 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule { pname = "txtpbfmt"; - version = "0-unstable-2024-06-11"; + version = "0-unstable-2024-11-12"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "dedd929c1c222fd4d895cda0e1c87b940262b1f5"; - hash = "sha256-L9btIjcQ3XMPzUrizoSEJ/Zj2xWphFAka3qtzm2mxP4="; + rev = "20d2c9ebc01daa87ca2b7b697a757613012b104d"; + hash = "sha256-gCGJQldwTa6Lq7Fvc4NAVRpmMs204qeKEsNFEjErTMA="; }; vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY="; @@ -22,11 +23,15 @@ buildGoModule { "-w" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { description = "Formatter for text proto files"; homepage = "https://github.com/protocolbuffers/txtpbfmt"; - license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "txtpbfmt"; }; }