Merge pull request #16024 from rushmorem/k8s-update

kubernetes: v1.0.3 -> v1.2.4

Changed files
+8 -8
pkgs
applications
networking
cluster
kubernetes
top-level
+7 -7
pkgs/applications/networking/cluster/kubernetes/default.nix
···
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
···
'';
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" ];
};
+1 -1
pkgs/top-level/all-packages.nix
···
ksuperkey = callPackage ../tools/X11/ksuperkey { };
kubernetes = callPackage ../applications/networking/cluster/kubernetes {
-
go = go_1_4;
+
go = go_1_6;
lame = callPackage ../development/libraries/lame { };