Merge pull request #48758 from mayflower/pkg/docker-machine-kvm

docker-machine-kvm: 0.8.2 -> 0.10.0, docker-machine-kvm2: use minikube source
This commit is contained in:
Jaka Hudoklin 2018-10-20 22:03:28 +02:00 committed by GitHub
commit c018b7c73d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions

View File

@ -3,7 +3,7 @@
buildGoPackage rec {
name = "docker-machine-kvm-${version}";
version = "0.8.2";
version = "0.10.0";
goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
goDeps = ./kvm-deps.nix;
@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "dhiltgen";
repo = "docker-machine-kvm";
sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p";
sha256 = "0ch4zwb6h7hnr5l3skj1daypvpyms2i666lbnmakpw1fw3zvjmgy";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -1,19 +1,14 @@
{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, minikube }:
buildGoPackage rec {
pname = "docker-machine-kvm2";
name = "${pname}-${version}";
version = "0.27.0";
version = minikube.version;
goPackagePath = "k8s.io/minikube";
subPackages = [ "cmd/drivers/kvm" ];
src = fetchFromGitHub {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
};
src = minikube.src;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libvirt ];