mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 14:11:36 +00:00
Merge pull request #47765 from vdemeester/update-minikube
minikube: 0.28.1 -> 0.29.0
This commit is contained in:
commit
e680208920
|
@ -14,7 +14,9 @@ let
|
||||||
in buildGoPackage rec {
|
in buildGoPackage rec {
|
||||||
pname = "minikube";
|
pname = "minikube";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
version = "0.28.1";
|
version = "0.29.0";
|
||||||
|
|
||||||
|
kubernetesVersion = "1.11.2";
|
||||||
|
|
||||||
goPackagePath = "k8s.io/minikube";
|
goPackagePath = "k8s.io/minikube";
|
||||||
|
|
||||||
|
@ -22,7 +24,7 @@ in buildGoPackage rec {
|
||||||
owner = "kubernetes";
|
owner = "kubernetes";
|
||||||
repo = "minikube";
|
repo = "minikube";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm";
|
sha256 = "09px8pxml7xrnfhyjvlhf1hw7zdj9sw47a0fv5wj5aard54lhs1l";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
|
buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
|
||||||
|
@ -35,7 +37,7 @@ in buildGoPackage rec {
|
||||||
|
|
||||||
ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
|
ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
|
||||||
ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
|
ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
|
||||||
KUBERNETES_VERSION=$(${python}/bin/python hack/get_k8s_version.py --k8s-version-only 2>&1) || true
|
KUBERNETES_VERSION=${kubernetesVersion}
|
||||||
|
|
||||||
export buildFlagsArray="-ldflags=\
|
export buildFlagsArray="-ldflags=\
|
||||||
-X k8s.io/minikube/pkg/version.version=v${version} \
|
-X k8s.io/minikube/pkg/version.version=v${version} \
|
||||||
|
|
Loading…
Reference in a new issue