From e81f400ac4736c7d85dddb25561723da0cbb34f5 Mon Sep 17 00:00:00 2001 From: Maarten Hoogendoorn Date: Sun, 15 Jan 2017 02:30:43 +0100 Subject: [PATCH] kubernetes: Fix build Disabled "mungedocs", which broke the build. This appears to be a piece of development tooling to make sure that the documentation is correct. We don't really care about that when we a specific k8s version for NixOS. --- pkgs/applications/networking/cluster/kubernetes/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 377c5ee9cd6..50519278895 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin" + # 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 '';