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

Merge pull request #16024 from rushmorem/k8s-update

Browse Source 
kubernetes: v1.0.3 -> v1.2.4
This commit is contained in:
Rushmore Mushambi 2016-06-06 19:42:34 +02:00
commit 97c64f560c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,21 +2,21 @@
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
version = "1.0.3";
version = "1.2.4";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "12wqw9agiz07wlw1sd0n41fn6xf74zn5sv37hslfa77w2d4ri5yb";
sha256 = "1a3y0f1l008ywkwwygg9vn2rb722c54i3pbgqks38gw1yyvgbiih";
};
buildInputs = [ makeWrapper which go iptables rsync ];
buildPhase = ''
GOPATH=$(pwd):$(pwd)/Godeps/_workspace
mkdir -p $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform
ln -s $(pwd) $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes
mkdir -p $(pwd)/Godeps/_workspace/src/k8s.io
ln -s $(pwd) $(pwd)/Godeps/_workspace/src/k8s.io/kubernetes
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
patchShebangs ./hack
@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "Open source implementation of container cluster management";
description = "Production-Grade Container Scheduling and Management";
license = licenses.asl20;
homepage = https://github.com/GoogleCloudPlatform;
homepage = http://kubernetes.io;
maintainers = with maintainers; [offline];
platforms = [ "x86_64-linux" ];
};

2
pkgs/top-level/all-packages.nix
View File

@ -13178,7 +13178,7 @@ in
ksuperkey = callPackage ../tools/X11/ksuperkey { };
kubernetes = callPackage ../applications/networking/cluster/kubernetes {
go = go_1_4;
go = go_1_6;
};
lame = callPackage ../development/libraries/lame { };