From 38912020284406f75bae66e7a724080c2986ff70 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 15 Nov 2022 11:49:31 -0800 Subject: git-team: 1.7.0 -> 1.8.0 Co-authored-by: Jan Schmitt (cherry picked from commit bf2536b67903809e5703a78b6103ab8c73036d80) --- .../git-and-tools/git-team/default.nix | 42 +++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-team/default.nix b/pkgs/applications/version-management/git-and-tools/git-team/default.nix index 6ec4589f570e..4857384148d8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-team/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-team/default.nix @@ -1,49 +1,39 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch +, go-mockery , installShellFiles }: buildGoModule rec { pname = "git-team"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "hekmekk"; repo = "git-team"; rev = "v${version}"; - hash = "sha256-pHKfehPyy01uVN6kjjPGtdkltw7FJ+HmIlwGs4iRhVo="; + hash = "sha256-LZR30zqwit/xydQbpGm1LXd/tno/sTCaftgjVkVS6ZY="; }; - patches = [ - (fetchpatch { - name = "1-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/d8632d9938379293521f9b3f2a93df680dd13a31.patch"; - hash = "sha256-hlmjPf3qp8WPNSH+GgkqATDiKIRzo+t81Npkptw8vgI="; - }) - (fetchpatch { - name = "2-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/f6acc96c2ffe76c527f2f2897b368cbb631d738c.patch"; - hash = "sha256-Pe+UAK9N1NpXhFGYv9l1iZ1/fCCqnT8OSgKdt/vUqO4="; - }) - (fetchpatch { - name = "3-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/2f38137298e4749a8dfe37e085015360949e73ad.patch"; - hash = "sha256-+6C8jp/qwYVmbL+SpV9FJIVyBRvX4tXBcoHMB//nNTk="; - }) - ]; + vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A="; - vendorSha256 = "sha256-GdwksPmYEGTq/FkG/rvn3o0zMKU1cSkpgZ+GrfVgLWM="; + nativeBuildInputs = [ + go-mockery + installShellFiles + ]; - nativeBuildInputs = [ installShellFiles ]; + preBuild = '' + mockery --dir=src/ --all --keeptree + ''; postInstall = '' - go run main.go --generate-man-page > ${pname}.1 - installManPage ${pname}.1 + go run main.go --generate-man-page > git-team.1 + installManPage git-team.1 - # Currently only bash completions are provided - installShellCompletion --cmd git-team --bash <($out/bin/git-team completion bash) + installShellCompletion --cmd git-team \ + --bash <($out/bin/git-team completion bash) \ + --zsh <($out/bin/git-team completion zsh) ''; meta = with lib; { -- cgit v1.2.3