Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4cb3041e49cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f1c098a2827
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 10, 2019

  1. docker-machine-xhyve: update repository location 

    The zchee repository now redirects to machine-drivers.
    @mroi
    mroi committed Dec 10, 2019
    Copy the full SHA
    5c01936 View commit details

Commits on Dec 21, 2019

  1. docker-machine-xhyve: 0.3.3 -> 0.4.0 

    remove explicit dependencies, upstream vendorizes them properly
    @mroi
    mroi committed Dec 21, 2019
    Copy the full SHA
    475bf6d View commit details

  2. docker-machine-xhyve: support lib9p shared file system 

    The lib9p library for host-guest file sharing in xhyve needs to be built separately.
    @mroi
    mroi committed Dec 21, 2019
    Copy the full SHA
    08ecf22 View commit details

  3. docker-machine-xhyve: fix file mode inconsistencies 

    File modes are not properly translated from L9P to host values.
Instead, they are assumed to be identical, which is wrong on macOS.
machine-drivers/docker-machine-driver-xhyve#225
    @mroi
    mroi committed Dec 21, 2019
    Copy the full SHA
    338386b View commit details

Commits on Jan 15, 2020

  1. Merge pull request #75432 from mroi/patch-xhyve 

    docker-machine-xhyve: enable and fix lib9p file sharing
    @marsam
    marsam authored Jan 15, 2020
    Copy the full SHA
    1f1c098 View commit details
21 changes: 0 additions & 21 deletions pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix
View file

This file was deleted.

24 changes: 18 additions & 6 deletions pkgs/applications/networking/cluster/docker-machine/xhyve.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }:
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }:

buildGoPackage rec {
pname = "docker-machine-xhyve";
version = "0.3.3";
version = "0.4.0";

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 {
rev = "v${version}";
owner = "zchee";
owner = "machine-drivers";
repo = "docker-machine-driver-xhyve";
sha256 = "0rj6pyqp4yv4j28bglqjs95rip5i77vv8mrkmqv1rxrsl3i8aqqy";
sha256 = "0000v97fr8xc5b39v44hsa87wrbk4bcwyaaivxv4hxlf4vlgg863";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ Hypervisor vmnet ];

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.";
license = licenses.bsd3;
maintainers = with maintainers; [ periklis ];
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -18555,6 +18555,7 @@ in
docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix {
inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
inherit (darwin) cctools;
};

docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { };