diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-24 01:38:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 01:38:57 +0000 |
| commit | e9fdcc9662557a57241150967ff5b9676d88d673 (patch) | |
| tree | faa8d5a7c3c4ab5228e065581fbd15e16e616743 /pkgs | |
| parent | cb6172c3b11ce5ae8612d6aace49b0a186474641 (diff) | |
| parent | 465d8b0fa9e1c25db1e39d65dd16f0cbd9144d8c (diff) | |
| download | nixpkgs-e9fdcc9662557a57241150967ff5b9676d88d673.tar nixpkgs-e9fdcc9662557a57241150967ff5b9676d88d673.tar.gz nixpkgs-e9fdcc9662557a57241150967ff5b9676d88d673.tar.bz2 nixpkgs-e9fdcc9662557a57241150967ff5b9676d88d673.tar.lz nixpkgs-e9fdcc9662557a57241150967ff5b9676d88d673.tar.xz nixpkgs-e9fdcc9662557a57241150967ff5b9676d88d673.tar.zst nixpkgs-e9fdcc9662557a57241150967ff5b9676d88d673.zip | |
Merge pull request #35425 from xeji/kubernetes-go-version
kubernetes: patch broken go version check
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e2f431e2a5e..090fc98566d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ "cmd/kubeadm" @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; + patches = [ + # patch is from https://github.com/kubernetes/kubernetes/pull/58207 + (fetchpatch { + url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch"; + sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w"; + }) + ]; + postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" |