kubectl-doctor: fix build with go 1.18 (#194693)

This commit is contained in:
zowoq 2022-10-07 02:40:58 +10:00 committed by GitHub
parent 707ed163a9
commit 38eb5ec7ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoModule rec {
pname = "kubectl-doctor";
@ -11,7 +11,16 @@ buildGoModule rec {
sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY=";
};
vendorSha256 = "sha256-pdg65q7iMkcpFvSVUTa07m5URLQNNEfWQ4mdGu4suBM=";
patches = [
(fetchpatch {
# https://github.com/emirozer/kubectl-doctor/pull/21
name = "go-1.19-client-go-0.25.patch";
url = "https://github.com/emirozer/kubectl-doctor/commit/a987ef58063e305409034af280d688a11682dbb9.patch";
sha256 = "sha256-NQd/WxUfYwBDowhnoUWaOV8k7msiOhff3Bjux+a9R9E=";
})
];
vendorSha256 = "sha256-qhffg/s1RZFNW0nHLbJ89yqLzdC72ARXdbSfMLJK2pQ=";
postInstall = ''
mv $out/bin/{cmd,kubectl-doctor}

View File

@ -29334,10 +29334,7 @@ with pkgs;
kuttl = callPackage ../applications/networking/cluster/kuttl { };
kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor {
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
buildGoModule = buildGo117Module;
};
kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { };
kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };