summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2015-03-18 14:26:40 +0100
committerJaka Hudoklin <jakahudoklin@gmail.com>2015-03-18 14:37:03 +0100
commit2482b75eaeb0848b2be89848437a794dc3eee413 (patch)
treee9c68da2e844c38b4c19621a5aad91451da6a17a /pkgs/applications
parentdecf15fd57c8f26079cdfc7572f1097decfc296f (diff)
downloadnixpkgs-2482b75eaeb0848b2be89848437a794dc3eee413.tar
nixpkgs-2482b75eaeb0848b2be89848437a794dc3eee413.tar.gz
nixpkgs-2482b75eaeb0848b2be89848437a794dc3eee413.tar.bz2
nixpkgs-2482b75eaeb0848b2be89848437a794dc3eee413.tar.lz
nixpkgs-2482b75eaeb0848b2be89848437a794dc3eee413.tar.xz
nixpkgs-2482b75eaeb0848b2be89848437a794dc3eee413.tar.zst
nixpkgs-2482b75eaeb0848b2be89848437a794dc3eee413.zip
kubernetes: update to 0.12.1, fix module
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/cluster/kubernetes/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 7931da602d6..c89ad0a5168 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables,rsync }:
+{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables, rsync, utillinux, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "v0.5.4";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubernetes";
-    rev = version;
-    sha256 = "1pipcqpjz9zsi4kfsbdvbbbia642l4xg50pznjw5v061c5xk7vnk";
+    rev = "v${version}";
+    sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml";
   };
 
   buildInputs = [ makeWrapper which go iptables rsync ];
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    wrapProgram "$out/bin/kube-proxy" --set "PATH" "${iptables}/bin"
+    wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"
+    wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin"
   '';
 
   meta = with stdenv.lib; {