diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2018-02-16 13:56:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 13:56:59 +0000 |
| commit | 87559028efcfb8860ece1ac97296702cca4830ae (patch) | |
| tree | 3e769383682d452348e97c2c38aeb7856e7254a1 /pkgs | |
| parent | b2f39f97d061010b2a0b7e25e2ad1ffdb293fe19 (diff) | |
| parent | f44a81e19fb8d9f57c8e3b2944c473ba1e3466d7 (diff) | |
| download | nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.gz nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.bz2 nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.lz nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.xz nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.zst nixlib-87559028efcfb8860ece1ac97296702cca4830ae.zip | |
Merge pull request #33954 from kuznero/pr/kubernetes
kubernetes: 1.7.9 -> 1.9.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubecfg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 7f17bd57c194..73a28325f52d 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.5.0"; in +let version = "0.6.0"; in buildGoPackage { name = "kubecfg-${version}"; @@ -9,7 +9,7 @@ buildGoPackage { owner = "ksonnet"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93"; + sha256 = "12kv1p707kdxjx5l8rcikd1gjwp5xjxdmmyvlpnvyagrphgrwpsf"; }; goPackagePath = "github.com/ksonnet/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e8686ade5900..e2f431e2a5e5 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -8,8 +8,6 @@ "cmd/kube-controller-manager" "cmd/kube-proxy" "plugin/cmd/kube-scheduler" - "federation/cmd/federation-apiserver" - "federation/cmd/federation-controller-manager" "test/e2e/e2e.test" ] }: @@ -18,13 +16,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.7.9"; + version = "1.9.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi"; + sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; |