public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6874 from offlinehacker/pkgs/kubernetes/update

Browse Source 
kubernetes: update to 0.12.1, fix module
This commit is contained in:
Jaka Hudoklin
2015-03-20 11:22:48 +01:00
parent 3bb0e6df8a 2482b75eae
commit 89f41b90fa
3 changed files with 109 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@@ -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; {