diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-04-28 14:12:53 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-04-28 14:12:53 +0200 |
| commit | f5bc58d733e57e5887e3224de14fa12e44aca84f (patch) | |
| tree | 65ab7941d4c1b2477817e2bcc363256b8ed000b2 /pkgs | |
| parent | 7b878a7ca9207147e1a1fa3b19e2912cd9216493 (diff) | |
| parent | 6cb195a83d43531c465b6678ca6bd94ef205fea3 (diff) | |
| download | nixlib-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar nixlib-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.gz nixlib-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.bz2 nixlib-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.lz nixlib-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.xz nixlib-f5bc58d733e57e5887e3224de14fa12e44aca84f.tar.zst nixlib-f5bc58d733e57e5887e3224de14fa12e44aca84f.zip | |
Merge pull request #7545 from offlinehacker/pkgs/kubernetes/fixes
kubernetes: update to 0.15, module fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 23ec975078b8..fbfe4de23b83 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -2,25 +2,27 @@ stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "0.12.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml"; + sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8"; }; buildInputs = [ makeWrapper which go iptables rsync ]; - preBuild = "patchShebangs ./hack"; - - postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go''; + buildPhase = '' + substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" + GOPATH=$(pwd) + patchShebangs ./hack + hack/build-go.sh --use_go_build + ''; installPhase = '' mkdir -p "$out/bin" cp _output/local/go/bin/* "$out/bin/" - cp pause $out/bin/kube-pause ''; preFixup = '' |