public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92989 from r-ryantm/auto-update/minikube 

minikube: 1.11.0 -> 1.12.0
This commit is contained in:
Mario Rodas 2020-07-13 07:06:33 -05:00 committed by GitHub
parent 7204d9aa36 9e8cc18327
commit b1de834f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
View File

@ -1,12 +1,12 @@
{ lib, buildGoModule, minikube }: { lib, buildGoModule, minikube }:
buildGoModule rec { buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256;
pname = "docker-machine-hyperkit"; pname = "docker-machine-hyperkit";
buildPhase = '' buildPhase = ''
make docker-machine-driver-hyperkit COMMIT=${commit} make docker-machine-driver-hyperkit COMMIT=${src.rev}
''; '';
installPhase = '' installPhase = ''

4
pkgs/applications/networking/cluster/docker-machine/kvm2.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }: { lib, buildGoModule, minikube }:
buildGoModule rec { buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256;
pname = "docker-machine-kvm2"; pname = "docker-machine-kvm2";
@ -10,7 +10,7 @@ buildGoModule rec {
''; '';
buildPhase = '' buildPhase = ''
make docker-machine-driver-kvm2 COMMIT=${commit} make docker-machine-driver-kvm2 COMMIT=${src.rev}
''; '';
installPhase = '' installPhase = ''

13
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -11,18 +11,15 @@
buildGoModule rec { buildGoModule rec {
pname = "minikube"; pname = "minikube";
version = "1.11.0"; version = "1.12.0";
# for -ldflags vendorSha256 = "0wcm7kw5z7d0ch59nyx5xlv5ci7jrwnzspmsh1yb76318cx2aghi";
commit = "57e2f55f47effe9ce396cea42a1e0eb4f611ebbd";
vendorSha256 = "1l9dxn7yy21x4b3cg6l5a08wx2ng8qf531ilg8yf1rznwfwjajrv";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = "minikube"; repo = "minikube";
rev = "v${version}"; rev = "v${version}";
sha256 = "0y761svwyrpc4ywdd4vr9hxkg6593wg4wwqzn8n86g0zcz6qg11d"; sha256 = "0bvdyfx5vjcgnkqd23rpbbhxf1zigpzxlqpay2sb6dpldsj0nhdk";
}; };
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
@ -30,7 +27,7 @@ buildGoModule rec {
buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null;
buildPhase = '' buildPhase = ''
make COMMIT=${commit} make COMMIT=${src.rev}
''; '';
installPhase = '' installPhase = ''
@ -40,7 +37,7 @@ buildGoModule rec {
export MINIKUBE_WANTUPDATENOTIFICATION=false export MINIKUBE_WANTUPDATENOTIFICATION=false
export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false
for shell in bash zsh; do for shell in bash zsh fish; do
$out/bin/minikube completion $shell > minikube.$shell $out/bin/minikube completion $shell > minikube.$shell
installShellCompletion minikube.$shell installShellCompletion minikube.$shell
done done