From 8d5e32ec44af3d5c8eb2112b91e1a736ec15d7d6 Mon Sep 17 00:00:00 2001 From: Atkins Date: Wed, 4 Dec 2019 18:08:20 +0800 Subject: [PATCH] minikube: 1.3.1 -> 1.5.2 --- .../networking/cluster/docker-machine/kvm2.nix | 2 +- .../networking/cluster/minikube/default.nix | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 78dcc713d32..609b7b02cbb 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; pname = "docker-machine-kvm2"; subPackages = [ "cmd/drivers/kvm" ]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d59089443bb..dbf84d4a36c 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -4,37 +4,31 @@ , pkgconfig , makeWrapper , go-bindata -, bash , libvirt , vmnet }: buildGoModule rec { pname = "minikube"; - version = "1.3.1"; + version = "1.5.2"; # for -ldflags - commit = "ca60a424ce69a4d79f502650199ca2b52f29e631"; + commit = "792dbf92a1de583fcee76f8791cff12e0c9440ad"; goPackagePath = "k8s.io/minikube"; subPackages = [ "cmd/minikube" ]; - modSha256 = "0ajzkc3xs7ql0v5762d3rh6idk04nhglfph3ldl25mnafwb7qd9l"; + modSha256 = "0nv7f1a1ag3r58i1hnk0nikrms0a22017rq55nl39bg9z58d4vk2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0kfd7041y6fayz8jl7zlw2lccnrx4d9qramx99j8mcw5syc2mwsd"; + sha256 = "1hahils630aajzrb0z82h3kpgibsyj0lwrknd9whdmvzi2yisr3w"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; - postPatch = '' - substituteInPlace pkg/minikube/command/exec_runner.go \ - --replace "/bin/bash" ${bash}/bin/bash - ''; - preBuild = '' go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/...