There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
In "minikube: 1.0.1 -> 1.2.0" [1], the package changed from
buildGoPackage to buildGoModule. This package, docker-machine-kvm2, is
built from the same sources and must follow the same packaging.
[1] a12efe947f
