about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2017-09-01 12:07:36 +0200
committerRobin Gloster <mail@glob.in>2017-09-24 11:44:25 +0200
commitbff428616a4f2478f606fa7641cfcdbdd0711380 (patch)
treea3ca67ad7db120c500e527ceb694202857eb2a9d
parentff6413850b818ed9d68f6c70c258a6b3074dddb6 (diff)
downloadnixlib-bff428616a4f2478f606fa7641cfcdbdd0711380.tar
nixlib-bff428616a4f2478f606fa7641cfcdbdd0711380.tar.gz
nixlib-bff428616a4f2478f606fa7641cfcdbdd0711380.tar.bz2
nixlib-bff428616a4f2478f606fa7641cfcdbdd0711380.tar.lz
nixlib-bff428616a4f2478f606fa7641cfcdbdd0711380.tar.xz
nixlib-bff428616a4f2478f606fa7641cfcdbdd0711380.tar.zst
nixlib-bff428616a4f2478f606fa7641cfcdbdd0711380.zip
kubernetes: 1.6.4 -> 1.7.1
-rw-r--r--pkgs/applications/networking/cluster/kubernetes/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 7e1e3fd42afa..ecce3431e482 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -17,13 +17,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.6.4";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1waxkr4ycrd23w8pi83gyf6jmawi1nhfzixp70fcwwka5h7p2y91";
+    sha256 = "1frf2nxk45lsbkq73fj72gxgr76icqdrsdqh20f5gpwiqn23n7c3";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f317f89b9f5..4355b7305b71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15115,9 +15115,7 @@ with pkgs;
 
   ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
 
-  kubernetes = callPackage ../applications/networking/cluster/kubernetes {
-    go = go_1_7;
-  };
+  kubernetes = callPackage ../applications/networking/cluster/kubernetes {  };
 
   kube-dns = callPackage ../applications/networking/cluster/kubernetes/dns.nix { };