From 412dbc6a624efd0f31038be5942d8401912d73da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Mar 2023 01:54:07 +0000 Subject: [PATCH 1/3] gomplate: 3.11.3 -> 3.11.4 --- pkgs/development/tools/gomplate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index ada936ed540b..8301e1fea206 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gomplate"; - version = "3.11.3"; + version = "3.11.4"; owner = "hairyhenderson"; rev = "v${version}"; src = fetchFromGitHub { inherit owner rev; repo = pname; - sha256 = "sha256-NvTwiGyBHhHiVHdWeXnJONNkHkrvsc1zmHPK8rSHaQw="; + sha256 = "sha256-3WTscK2nmjd7+cUKGaAi9i+C3HFpuxb7eRCn0fOHFV4="; }; - vendorSha256 = "sha256-BIcOErtlcnE70Mo6fjmA/btvSpw95RaKLqNWsgyJgpc="; + vendorHash = "sha256-X3o00WATVlWoc1Axug5ErPtLDQ+BL3CtO/QyNtavIpg="; postPatch = '' # some tests require network access From ea23ad383330210877e69bd471e72f321bc573bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Mar 2023 10:24:44 +0100 Subject: [PATCH 2/3] gomplate: add changelog to meta --- pkgs/development/tools/gomplate/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 8301e1fea206..7d8ea6453c83 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -38,7 +38,8 @@ buildGoModule rec { meta = with lib; { description = "A flexible commandline tool for template rendering"; homepage = "https://gomplate.ca/"; - maintainers = with maintainers; [ ris jlesquembre ]; + changelog = "https://github.com/hairyhenderson/gomplate/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ris jlesquembre ]; }; } From 075895f836f2a0c7cd8886719ccea790350155ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Mar 2023 10:33:47 +0100 Subject: [PATCH 3/3] gomplate: modernize --- pkgs/development/tools/gomplate/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 7d8ea6453c83..0587a3e1d912 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -1,15 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gomplate"; version = "3.11.4"; - owner = "hairyhenderson"; - rev = "v${version}"; src = fetchFromGitHub { - inherit owner rev; + owner = "hairyhenderson"; repo = pname; - sha256 = "sha256-3WTscK2nmjd7+cUKGaAi9i+C3HFpuxb7eRCn0fOHFV4="; + rev = "refs/tags/v${version}"; + hash = "sha256-3WTscK2nmjd7+cUKGaAi9i+C3HFpuxb7eRCn0fOHFV4="; }; vendorHash = "sha256-X3o00WATVlWoc1Axug5ErPtLDQ+BL3CtO/QyNtavIpg="; @@ -32,7 +34,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" + "-X github.com/${src.owner}/${pname}/v3/version.Version=${version}" ]; meta = with lib; {