diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-06-08 13:24:18 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-06-08 13:24:18 +0200 |
| commit | 256692cac178f9912c0362ad21ad95e86f22cb09 (patch) | |
| tree | 88efc8935d54b253ba01f2a02868404a39e7c279 /pkgs/applications | |
| parent | 9cd6786acb2091a59b3647543cbb1197693b28f9 (diff) | |
| parent | 392fc849e41e4d9175c185bac4a8fa480bf832b2 (diff) | |
| download | nixlib-256692cac178f9912c0362ad21ad95e86f22cb09.tar nixlib-256692cac178f9912c0362ad21ad95e86f22cb09.tar.gz nixlib-256692cac178f9912c0362ad21ad95e86f22cb09.tar.bz2 nixlib-256692cac178f9912c0362ad21ad95e86f22cb09.tar.lz nixlib-256692cac178f9912c0362ad21ad95e86f22cb09.tar.xz nixlib-256692cac178f9912c0362ad21ad95e86f22cb09.tar.zst nixlib-256692cac178f9912c0362ad21ad95e86f22cb09.zip | |
Merge pull request #8221 from offlinehacker/kubernetes/update
Update kubernetes to 0.18.0, fix module
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index fbfe4de23b83..a096d43b11cc 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -2,27 +2,33 @@ stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "0.15.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8"; + sha256 = "1adbd5n2fs1278f6kz6pd23813w2k4pgcxjl21idflh8jafxsyj7"; }; buildInputs = [ makeWrapper which go iptables rsync ]; buildPhase = '' + GOPATH=$(pwd):$(pwd)/Godeps/_workspace + mkdir -p $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform + ln -s $(pwd) $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes + substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" - GOPATH=$(pwd) patchShebangs ./hack hack/build-go.sh --use_go_build + + (cd cluster/addons/dns/kube2sky && go build ./kube2sky.go) ''; installPhase = '' mkdir -p "$out/bin" cp _output/local/go/bin/* "$out/bin/" + cp cluster/addons/dns/kube2sky/kube2sky "$out/bin/" ''; preFixup = '' |