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

minikube: 1.3.1 -> 1.5.2

Browse Source
This commit is contained in:
Atkins 2019-12-04 18:08:20 +08:00
parent 036c2fed12
commit 8d5e32ec44
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 goPackagePath postPatch preBuild; inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild;
pname = "docker-machine-kvm2"; pname = "docker-machine-kvm2";
subPackages = [ "cmd/drivers/kvm" ]; subPackages = [ "cmd/drivers/kvm" ];

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

@ -4,37 +4,31 @@
, pkgconfig , pkgconfig
, makeWrapper , makeWrapper
, go-bindata , go-bindata
, bash
, libvirt , libvirt
, vmnet , vmnet
}: }:
buildGoModule rec { buildGoModule rec {
pname = "minikube"; pname = "minikube";
version = "1.3.1"; version = "1.5.2";
# for -ldflags # for -ldflags
commit = "ca60a424ce69a4d79f502650199ca2b52f29e631"; commit = "792dbf92a1de583fcee76f8791cff12e0c9440ad";
goPackagePath = "k8s.io/minikube"; goPackagePath = "k8s.io/minikube";
subPackages = [ "cmd/minikube" ]; subPackages = [ "cmd/minikube" ];
modSha256 = "0ajzkc3xs7ql0v5762d3rh6idk04nhglfph3ldl25mnafwb7qd9l"; modSha256 = "0nv7f1a1ag3r58i1hnk0nikrms0a22017rq55nl39bg9z58d4vk2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = "minikube"; repo = "minikube";
rev = "v${version}"; rev = "v${version}";
sha256 = "0kfd7041y6fayz8jl7zlw2lccnrx4d9qramx99j8mcw5syc2mwsd"; sha256 = "1hahils630aajzrb0z82h3kpgibsyj0lwrknd9whdmvzi2yisr3w";
}; };
nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ]
++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ];
postPatch = ''
substituteInPlace pkg/minikube/command/exec_runner.go \
--replace "/bin/bash" ${bash}/bin/bash
'';
preBuild = '' preBuild = ''
go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... 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/... go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/...