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

minikube: use src.rev as commit

Browse Source
This commit is contained in:
Mario Rodas 2020-07-12 04:20:00 -05:00
parent c0a0552f10
commit 2c774044e2
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
View File

@ -1,12 +1,12 @@
{ lib, buildGoModule, minikube }: { lib, buildGoModule, minikube }:
buildGoModule rec { buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256;
pname = "docker-machine-hyperkit"; pname = "docker-machine-hyperkit";
buildPhase = '' buildPhase = ''
make docker-machine-driver-hyperkit COMMIT=${commit} make docker-machine-driver-hyperkit COMMIT=${src.rev}
''; '';
installPhase = '' installPhase = ''

4
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 vendorSha256 commit; inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256;
pname = "docker-machine-kvm2"; pname = "docker-machine-kvm2";
@ -10,7 +10,7 @@ buildGoModule rec {
''; '';
buildPhase = '' buildPhase = ''
make docker-machine-driver-kvm2 COMMIT=${commit} make docker-machine-driver-kvm2 COMMIT=${src.rev}
''; '';
installPhase = '' installPhase = ''

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

@ -13,9 +13,6 @@ buildGoModule rec {
pname = "minikube"; pname = "minikube";
version = "1.12.0"; version = "1.12.0";
# for -ldflags
commit = "57e2f55f47effe9ce396cea42a1e0eb4f611ebbd";
vendorSha256 = "0wcm7kw5z7d0ch59nyx5xlv5ci7jrwnzspmsh1yb76318cx2aghi"; vendorSha256 = "0wcm7kw5z7d0ch59nyx5xlv5ci7jrwnzspmsh1yb76318cx2aghi";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -30,7 +27,7 @@ buildGoModule rec {
buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null;
buildPhase = '' buildPhase = ''
make COMMIT=${commit} make COMMIT=${src.rev}
''; '';
installPhase = '' installPhase = ''