about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVincent Demeester <vincent@sbr.pm>2019-03-08 22:01:53 +0100
committerxeji <36407913+xeji@users.noreply.github.com>2019-03-08 22:01:53 +0100
commit1f037a90f1a6ad306a9942964722c66132d842d6 (patch)
tree422097f88f1af695dfa3a39b6cb6177e35e0e815 /pkgs
parent283d9f58b4f656bb04abbe79f3ef5ab4b38c4654 (diff)
downloadnixlib-1f037a90f1a6ad306a9942964722c66132d842d6.tar
nixlib-1f037a90f1a6ad306a9942964722c66132d842d6.tar.gz
nixlib-1f037a90f1a6ad306a9942964722c66132d842d6.tar.bz2
nixlib-1f037a90f1a6ad306a9942964722c66132d842d6.tar.lz
nixlib-1f037a90f1a6ad306a9942964722c66132d842d6.tar.xz
nixlib-1f037a90f1a6ad306a9942964722c66132d842d6.tar.zst
nixlib-1f037a90f1a6ad306a9942964722c66132d842d6.zip
minikube: 0.30.0 -> 0.35.0 (#56879)
* minikube: 0.30.0 -> 0.34.1

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

* minikube: 0.34.1 -> 0.35.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/cluster/minikube/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index c44b7ac1dc76..13c7f59f7944 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,9 +14,9 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.30.0";
+  version = "0.35.0";
 
-  kubernetesVersion = "1.11.2";
+  kubernetesVersion = "1.13.4";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -24,7 +24,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "02jxwh8qrvjn31rzjwx23908nd1i592drfdykxbc5b6a62fwp02z";
+    sha256 = "1qb342zs50sdfvfb8vbn7vrx11qqjy1hw518c053s7p34ljb24qd";
   };
 
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
@@ -35,7 +35,9 @@ in buildGoPackage rec {
 
     go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
 
-    ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
+    VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//")
+    VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//")
+    ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0
     ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
     KUBERNETES_VERSION=${kubernetesVersion}
 
@@ -66,7 +68,7 @@ in buildGoPackage rec {
     homepage    = https://github.com/kubernetes/minikube;
     description = "A tool that makes it easy to run Kubernetes locally";
     license     = licenses.asl20;
-    maintainers = with maintainers; [ ebzzry copumpkin ];
+    maintainers = with maintainers; [ ebzzry copumpkin vdemeester ];
     platforms   = with platforms; unix;
   };
 }