about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2015-04-25 14:18:05 +0200
committerJaka Hudoklin <jakahudoklin@gmail.com>2015-04-25 14:18:05 +0200
commitcbf1c3ca22cd719c4462d138297edfdc168fbad4 (patch)
tree3d6a383eb057fbdb3f7687a7eaaa50df6e25311e /pkgs
parent4e51a466bdfa260d15fbaafe52cdccf5280f13d1 (diff)
downloadnixlib-cbf1c3ca22cd719c4462d138297edfdc168fbad4.tar
nixlib-cbf1c3ca22cd719c4462d138297edfdc168fbad4.tar.gz
nixlib-cbf1c3ca22cd719c4462d138297edfdc168fbad4.tar.bz2
nixlib-cbf1c3ca22cd719c4462d138297edfdc168fbad4.tar.lz
nixlib-cbf1c3ca22cd719c4462d138297edfdc168fbad4.tar.xz
nixlib-cbf1c3ca22cd719c4462d138297edfdc168fbad4.tar.zst
nixlib-cbf1c3ca22cd719c4462d138297edfdc168fbad4.zip
kubernetes: update to 0.15
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/cluster/kubernetes/default.nix14
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 c89ad0a51685..4eb4d8cc1ea9 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 = ''