Unverified Commit 38eb5ec7 authored by zowoq's avatar zowoq Committed by GitHub
Browse files

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

parent 707ed163

pkgs/applications/networking/cluster/kubectl-doctor/default.nix

+11 −2
Original line number Diff line number Diff line 
{ 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}

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -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 { };