From ce9b34d3d41e462cb0a8e02e0ea497b74995541f Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Tue, 13 Dec 2016 15:24:18 +0100
Subject: kubernetes: 1.4.6 -> 1.5.2

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index da5d426a0c5d..377c5ee9cd6c 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -17,13 +17,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.4.6";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1n5ppzr9hnn7ljfdgx40rnkn6n6a9ya0qyrhjhpnbfwz5mdp8ws3";
+    sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v";
   };
 
   buildInputs = [ makeWrapper which go rsync go-bindata ];
@@ -43,14 +43,14 @@ stdenv.mkDerivation rec {
 
   postBuild = ''
     ./hack/generate-docs.sh
-    (cd build/pause && gcc pause.c -o pause)
+    (cd build-tools/pause && gcc pause.c -o pause)
   '';
 
   installPhase = ''
     mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin"
 
     cp _output/local/go/bin/* "$out/bin/"
-    cp build/pause/pause "$pause/bin/pause"
+    cp build-tools/pause/pause "$pause/bin/pause"
     cp -R docs/man/man1 "$man/share/man"
 
     $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
-- 
cgit 1.4.1