From 5d45de1fc1ae07e25ff6cec925d489fd12dc2993 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 19 Oct 2018 23:33:50 +0200 Subject: [PATCH 1/2] docker-machine-kvm: 0.8.2 -> 0.10.0 --- pkgs/applications/networking/cluster/docker-machine/kvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 5d47302960f..181663513d3 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -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 ]; From 672ff7eb0ed13656a17d6a2ac54b9acfa7586b59 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 19 Oct 2018 23:34:04 +0200 Subject: [PATCH 2/2] docker-machine-kvm2: use minikube version & source --- .../networking/cluster/docker-machine/kvm2.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index fd067936efd..41465766489 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -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 ];