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

Merge pull request #75432 from mroi/patch-xhyve

Browse Source 
docker-machine-xhyve: enable and fix lib9p file sharing
This commit is contained in:
Mario Rodas 2020-01-14 21:19:29 -05:00 committed by GitHub
commit 1f1c098a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix
View File

@ -1,21 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/docker/machine";
fetch = {
type = "git";
url = "https://github.com/docker/machine";
rev = "5b274558ea6ca822c06dd407a4e774a0105c3f60";
sha256 = "1wdq9h4bx7awgclh969gvmcnl9jvgv7ldfklnclh5iv47mi7q22d";
};
}
{
goPackagePath = "github.com/zchee/libhyperkit";
fetch = {
type = "git";
url = "https://github.com/zchee/libhyperkit";
rev = "1a19a7693fac32b46ec6cdd22da6fbec974447fc";
sha256 = "119f5gcl24znwnmi837jk667asd3lirx32jldpd4mbyb3sm9nz24";
};
}
]

24
pkgs/applications/networking/cluster/docker-machine/xhyve.nix
View File

@ -1,24 +1,36 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }: { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }:
buildGoPackage rec { buildGoPackage rec {
pname = "docker-machine-xhyve"; pname = "docker-machine-xhyve";
version = "0.3.3"; version = "0.4.0";
goPackagePath = "github.com/zchee/docker-machine-driver-xhyve"; goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
goDeps = ./xhyve-deps.nix;
# https://github.com/machine-drivers/docker-machine-driver-xhyve/pull/225
patches = fetchpatch {
url = "https://github.com/machine-drivers/docker-machine-driver-xhyve/commit/546256494bf2ccc33e4125bf45f504b0e3027d5a.patch";
sha256 = "1i8wxqccqkxvqrbsyd0g9s0kdskd8xi2jv0c1bji9aj4rq0a8cgz";
};
preBuild = ''
make -C go/src/${goPackagePath} CC=${stdenv.cc}/bin/cc LIBTOOL=${cctools}/bin/libtool GIT_CMD=: lib9p
export CGO_CFLAGS=-I$(pwd)/go/src/${goPackagePath}/vendor/github.com/jceel/lib9p
export CGO_LDFLAGS=$(pwd)/go/src/${goPackagePath}/vendor/build/lib9p/lib9p.a
'';
buildFlags = "--tags lib9p";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "zchee"; owner = "machine-drivers";
repo = "docker-machine-driver-xhyve"; repo = "docker-machine-driver-xhyve";
sha256 = "0rj6pyqp4yv4j28bglqjs95rip5i77vv8mrkmqv1rxrsl3i8aqqy"; sha256 = "0000v97fr8xc5b39v44hsa87wrbk4bcwyaaivxv4hxlf4vlgg863";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ Hypervisor vmnet ]; buildInputs = [ Hypervisor vmnet ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/zchee/docker-machine-driver-xhyve; homepage = https://github.com/machine-drivers/docker-machine-driver-xhyve;
description = "Xhyve driver for docker-machine."; description = "Xhyve driver for docker-machine.";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ periklis ]; maintainers = with maintainers; [ periklis ];

1
pkgs/top-level/all-packages.nix
View File

@ -18555,6 +18555,7 @@ in
docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix {
inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
inherit (darwin) cctools;
}; };
docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { };