public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35425 from xeji/kubernetes-go-version

Browse Source 
kubernetes: patch broken go version check
This commit is contained in:
Jörg Thalheim 2018-02-24 01:38:57 +00:00 committed by GitHub
commit e9fdcc9662
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -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 , iptables, coreutils
, components ? [ , components ? [
"cmd/kubeadm" "cmd/kubeadm"
@ -29,6 +29,14 @@ stdenv.mkDerivation rec {
outputs = ["out" "man" "pause"]; 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 = '' postPatch = ''
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"