From 3d266ccdb753354f7b2842a05060a0221ce468d4 Mon Sep 17 00:00:00 2001 From: Atkins Date: Sun, 11 Aug 2019 06:28:39 +0800 Subject: [PATCH 1/6] maintainers: add atkinschang --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e4947f4c74c..e9b05fa7a2f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -710,6 +710,12 @@ githubId = 55833; name = "Troels Henriksen"; }; + atkinschang = { + email = "atkinschang+nixpkgs@gmail.com"; + github = "AtkinsChang"; + githubId = 5193600; + name = "Atkins Chang"; + }; atnnn = { email = "etienne@atnnn.com"; github = "atnnn"; From 37aab73f56a6c9739469849b08485370a05b47c1 Mon Sep 17 00:00:00 2001 From: Atkins Date: Wed, 14 Aug 2019 02:02:34 +0800 Subject: [PATCH 2/6] minikube: 1.2.0 -> 1.3.1 --- .../cluster/docker-machine/kvm2.nix | 22 ++----- .../networking/cluster/minikube/default.nix | 63 ++++++++++--------- 2 files changed, 40 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index eb2946cec77..78dcc713d32 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,32 +1,22 @@ -{ stdenv, buildGoModule, libvirt, pkgconfig, minikube }: +{ lib, buildGoModule, minikube }: buildGoModule rec { - pname = "docker-machine-kvm2"; - version = minikube.version; + inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild; - goPackagePath = "k8s.io/minikube"; + pname = "docker-machine-kvm2"; subPackages = [ "cmd/drivers/kvm" ]; - src = minikube.src; - - modSha256 = minikube.go-modules.outputHash; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libvirt ]; - - preBuild = '' - export buildFlagsArray=(-ldflags="-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=v${version}") - ''; + modSha256 = minikube.go-modules.outputHash; postInstall = '' mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; description = "KVM2 driver for docker-machine."; license = licenses.asl20; - maintainers = with maintainers; [ tadfisher ]; + maintainers = with maintainers; [ tadfisher atkinschang ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 5637e486ef1..d59089443bb 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,68 +1,73 @@ -{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, libvirt, qemu -, gpgme, makeWrapper, vmnet -, docker-machine-kvm, docker-machine-kvm2 -, extraDrivers ? [] +{ stdenv +, buildGoModule +, fetchFromGitHub +, pkgconfig +, makeWrapper +, go-bindata +, bash +, libvirt +, vmnet }: -let - drivers = stdenv.lib.filter (d: d != null) (extraDrivers - ++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]); - - binPath = drivers - ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]); - -in buildGoModule rec { +buildGoModule rec { pname = "minikube"; - version = "1.2.0"; - - kubernetesVersion = "1.15.0"; + version = "1.3.1"; + # for -ldflags + commit = "ca60a424ce69a4d79f502650199ca2b52f29e631"; goPackagePath = "k8s.io/minikube"; + subPackages = [ "cmd/minikube" ]; + modSha256 = "0ajzkc3xs7ql0v5762d3rh6idk04nhglfph3ldl25mnafwb7qd9l"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0l9znrp49877cp1bkwx84c8lv282ga5a946rjbxi8gznkf3kwaw7"; + sha256 = "0kfd7041y6fayz8jl7zlw2lccnrx4d9qramx99j8mcw5syc2mwsd"; }; - modSha256 = "1cp63n0x2lgbqvvymx9byx48r42qw6w224x5x4iiarc2nryfdhn0"; + nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] + ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; - buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet; - subPackages = [ "cmd/minikube" ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "cmd/drivers/hyperkit"; + postPatch = '' + substituteInPlace pkg/minikube/command/exec_runner.go \ + --replace "/bin/bash" ${bash}/bin/bash + ''; preBuild = '' 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/... VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//") VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//") ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0 ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") - KUBERNETES_VERSION=${kubernetesVersion} export buildFlagsArray="-ldflags=\ - -X k8s.io/minikube/pkg/version.version=v${version} \ - -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \ - -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET \ - -X k8s.io/minikube/vendor/k8s.io/client-go/pkg/version.gitVersion=$KUBERNETES_VERSION \ - -X k8s.io/minikube/vendor/k8s.io/kubernetes/pkg/version.gitVersion=$KUBERNETES_VERSION" + -X ${goPackagePath}/pkg/version.version=v${version} \ + -X ${goPackagePath}/pkg/version.isoVersion=$ISO_VERSION \ + -X ${goPackagePath}/pkg/version.isoPath=$ISO_BUCKET \ + -X ${goPackagePath}/pkg/version.gitCommitID=${commit} \ + -X ${goPackagePath}/pkg/drivers/kvm.version=v${version} \ + -X ${goPackagePath}/pkg/drivers/kvm.gitCommitID=${commit} \ + -X ${goPackagePath}/pkg/drivers/hyperkit.version=v${version} \ + -X ${goPackagePath}/pkg/drivers/hyperkit.gitCommitID=${commit}" ''; postInstall = '' - wrapProgram $out/bin/${pname} --prefix PATH : $out/bin:${stdenv.lib.makeBinPath binPath} mkdir -p $out/share/bash-completion/completions/ MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube + mkdir -p $out/share/zsh/site-functions/ MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion zsh > $out/share/zsh/site-functions/_minikube - ''+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit ''; meta = with stdenv.lib; { homepage = https://github.com/kubernetes/minikube; description = "A tool that makes it easy to run Kubernetes locally"; license = licenses.asl20; - maintainers = with maintainers; [ ebzzry copumpkin vdemeester ]; + maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang ]; platforms = with platforms; unix; }; } From 036c2fed12aab1583d79c338b81872a0ca7e543c Mon Sep 17 00:00:00 2001 From: Atkins Date: Wed, 14 Aug 2019 02:02:55 +0800 Subject: [PATCH 3/6] docker-machine-hyperkit: separate from minikube --- .../cluster/docker-machine/hyperkit.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/networking/cluster/docker-machine/hyperkit.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix new file mode 100644 index 00000000000..7675f8cf6e9 --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -0,0 +1,21 @@ +{ lib, buildGoModule, minikube }: + +buildGoModule rec { + inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild; + + pname = "docker-machine-hyperkit"; + subPackages = [ "cmd/drivers/hyperkit" ]; + modSha256 = minikube.go-modules.outputHash; + + postInstall = '' + mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit + ''; + + meta = with lib; { + homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; + description = "HyperKit driver for docker-machine."; + license = licenses.asl20; + maintainers = with maintainers; [ atkinschang ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a00adec661d..ac1c717ca71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18793,6 +18793,7 @@ in docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; + docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { From 8d5e32ec44af3d5c8eb2112b91e1a736ec15d7d6 Mon Sep 17 00:00:00 2001 From: Atkins Date: Wed, 4 Dec 2019 18:08:20 +0800 Subject: [PATCH 4/6] minikube: 1.3.1 -> 1.5.2 --- .../networking/cluster/docker-machine/kvm2.nix | 2 +- .../networking/cluster/minikube/default.nix | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 78dcc713d32..609b7b02cbb 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; pname = "docker-machine-kvm2"; subPackages = [ "cmd/drivers/kvm" ]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d59089443bb..dbf84d4a36c 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -4,37 +4,31 @@ , pkgconfig , makeWrapper , go-bindata -, bash , libvirt , vmnet }: buildGoModule rec { pname = "minikube"; - version = "1.3.1"; + version = "1.5.2"; # for -ldflags - commit = "ca60a424ce69a4d79f502650199ca2b52f29e631"; + commit = "792dbf92a1de583fcee76f8791cff12e0c9440ad"; goPackagePath = "k8s.io/minikube"; subPackages = [ "cmd/minikube" ]; - modSha256 = "0ajzkc3xs7ql0v5762d3rh6idk04nhglfph3ldl25mnafwb7qd9l"; + modSha256 = "0nv7f1a1ag3r58i1hnk0nikrms0a22017rq55nl39bg9z58d4vk2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0kfd7041y6fayz8jl7zlw2lccnrx4d9qramx99j8mcw5syc2mwsd"; + sha256 = "1hahils630aajzrb0z82h3kpgibsyj0lwrknd9whdmvzi2yisr3w"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; - postPatch = '' - substituteInPlace pkg/minikube/command/exec_runner.go \ - --replace "/bin/bash" ${bash}/bin/bash - ''; - preBuild = '' 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/... From d6fe4e1ec12f7a0da323c8fd558d344ddcfad8ee Mon Sep 17 00:00:00 2001 From: Atkins Date: Wed, 4 Dec 2019 18:57:56 +0800 Subject: [PATCH 5/6] minikube: 1.5.2 -> 1.6.2 --- .../networking/cluster/docker-machine/hyperkit.nix | 3 ++- pkgs/applications/networking/cluster/minikube/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index 7675f8cf6e9..716e9da8b7e 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,10 +1,11 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; pname = "docker-machine-hyperkit"; subPackages = [ "cmd/drivers/hyperkit" ]; + modSha256 = minikube.go-modules.outputHash; postInstall = '' diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index dbf84d4a36c..866b39cacfd 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -10,19 +10,19 @@ buildGoModule rec { pname = "minikube"; - version = "1.5.2"; + version = "1.6.2"; # for -ldflags - commit = "792dbf92a1de583fcee76f8791cff12e0c9440ad"; + commit = "54f28ac5d3a815d1196cd5d57d707439ee4bb392"; goPackagePath = "k8s.io/minikube"; subPackages = [ "cmd/minikube" ]; - modSha256 = "0nv7f1a1ag3r58i1hnk0nikrms0a22017rq55nl39bg9z58d4vk2"; + modSha256 = "0ix9z0kifjlj9yjrj2m6lk1qya5cqz4v3pkp61cj6xfp36m4z3l2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1hahils630aajzrb0z82h3kpgibsyj0lwrknd9whdmvzi2yisr3w"; + sha256 = "1s18asq6bn94i33chyzl8r8hkpq3cf7pip7byadf2i05n59i9ha2"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; From d8b2f2b1edfb066d3ddc0eece200e20e27aec734 Mon Sep 17 00:00:00 2001 From: Atkins Date: Sat, 7 Mar 2020 22:58:56 +0800 Subject: [PATCH 6/6] minikube: 1.6.2 -> 1.8.1 --- pkgs/applications/networking/cluster/minikube/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 866b39cacfd..f49f1768ced 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -10,19 +10,19 @@ buildGoModule rec { pname = "minikube"; - version = "1.6.2"; + version = "1.8.1"; # for -ldflags - commit = "54f28ac5d3a815d1196cd5d57d707439ee4bb392"; + commit = "cbda04cf6bbe65e987ae52bb393c10099ab62014"; goPackagePath = "k8s.io/minikube"; subPackages = [ "cmd/minikube" ]; - modSha256 = "0ix9z0kifjlj9yjrj2m6lk1qya5cqz4v3pkp61cj6xfp36m4z3l2"; + modSha256 = "1wyz8aq291lx614ilqrcgzdc8rjxbd6v3rv1fy6r2m6snyysycfn"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1s18asq6bn94i33chyzl8r8hkpq3cf7pip7byadf2i05n59i9ha2"; + sha256 = "1nf0n701rw3anp8j7k3f553ipqwpzzxci41zsi0il4l35dpln5g0"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];