From 2db723b01fb765a6824531ea6673b94359ba4c68 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 7 Aug 2022 19:41:02 -0700 Subject: [PATCH] git-town: 7.7.0 -> 7.8.0 Plus a patch to fix the build using Go 1.18. --- pkgs/tools/misc/git-town/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 618d627921b..abca61358d9 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -1,16 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, git, testers, git-town, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }: buildGoModule rec { pname = "git-town"; - version = "7.7.0"; + version = "7.8.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc="; + sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI="; }; + patches = [ + # Fix "go vet" when building using Go 1.18. + (fetchpatch { + name = "fix-go-vet-in-go-1.18.patch"; + url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch"; + sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc="; + }) + ]; + vendorSha256 = null; nativeBuildInputs = [ installShellFiles makeWrapper ];