diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-06-21 18:38:36 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-06-24 22:35:38 +1000 |
commit | 47db3772a731d48f30d6dc97120ef77f5240096c (patch) | |
tree | 127a049ca577b26b616ff60a7fb8501218928e45 /pkgs/applications/networking/cluster/kubernetes | |
parent | 7f8734e9b75f6081dcac08482dcc35ef7260cdf3 (diff) |
kubernetes: switch to buildGoModule
Diffstat (limited to 'pkgs/applications/networking/cluster/kubernetes')
-rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 31 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/kubectl.nix | 13 |
2 files changed, 21 insertions, 23 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 8ed8cd5689136..5cbd307a3d73d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,11 +1,11 @@ -{ stdenv -, lib +{ lib +, buildGoModule , fetchFromGitHub , which -, go , makeWrapper , rsync , installShellFiles +, runtimeShell , kubectl , nixosTests @@ -19,7 +19,7 @@ ] }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubernetes"; version = "1.23.8"; @@ -30,23 +30,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-mu+jBSypoMNxOugLbS3foH4C4AqSZnlic4Bf1v9dYc8="; }; - nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; + vendorSha256 = null; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper which rsync installShellFiles ]; outputs = [ "out" "man" "pause" ]; patches = [ ./fixup-addonmanager-lib-path.patch ]; - postPatch = '' - substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - patchShebangs ./hack - ''; - WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" ] ++ components); - postBuild = '' + buildPhase = '' + runHook preBuild + substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${runtimeShell}" + patchShebangs ./hack ./cluster/addons/addon-manager + make "SHELL=${runtimeShell}" "WHAT=$WHAT" ./hack/update-generated-docs.sh + runHook postBuild ''; installPhase = '' @@ -69,7 +73,6 @@ stdenv.mkDerivation rec { --subst-var out chmod +x $out/bin/kube-addons - patchShebangs $out/bin/kube-addons wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh @@ -80,10 +83,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - disallowedReferences = [ go ]; - - GOFLAGS = [ "-trimpath" ]; - meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index 6a6f9042124b8..754bca32511c1 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, kubernetes }: +{ lib, buildGoModule, kubernetes }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubectl"; inherit (kubernetes) - disallowedReferences - GOFLAGS + buildPhase + doCheck nativeBuildInputs - postBuild - postPatch src + vendorSha256 version ; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { WHAT = lib.concatStringsSep " " [ "cmd/kubectl" "cmd/kubectl-convert" - ]; + ]; installPhase = '' runHook preInstall |