diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-10-07 02:40:58 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-06 18:40:58 +0200 |
| commit | 38eb5ec7ba32815d206f4fedca661e3d50aacf98 (patch) | |
| tree | 3e2030a67c8a99b557bbeb176821ef9ba087738c | |
| parent | 707ed163a9e082c35305758b965310f01678fa4c (diff) | |
kubectl-doctor: fix build with go 1.18 (#194693)
| -rw-r--r-- | pkgs/applications/networking/cluster/kubectl-doctor/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 5e78cc9b72bd9..8e504294053b0 100644 --- a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -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} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 872a4bd4eba6d..4f25d9b20d87f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |