From a60358bec9b6f89e7ed727c1d88336d8f0379ea1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 4 Jun 2022 18:43:18 +1000 Subject: [PATCH] kubernetes: drop obsolete workarounds --- .../networking/cluster/kubernetes/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index deb95b695d2..10b781a7dad 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -37,15 +37,7 @@ stdenv.mkDerivation rec { patches = [ ./fixup-addonmanager-lib-path.patch ]; postPatch = '' - # go env breaks the sandbox - substituteInPlace "hack/lib/golang.sh" \ - --replace 'echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"' 'echo "${go.GOOS}/${go.GOARCH}"' - substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - # hack/update-munge-docs.sh only performs some tests on the documentation. - # They broke building k8s; disabled for now. - echo "true" > "hack/update-munge-docs.sh" - patchShebangs ./hack '';