Unverified Commit b4e24340 authored by Michael Daniels's avatar Michael Daniels Committed by GitHub
Browse files

minikube: 1.37.0 -> 1.38.0, remove obsolete docker-machine-kvm2 (#485038)

parents 7e1765e0 4782bced
Loading
Loading
Loading
Loading
+0 −42
Original line number Diff line number Diff line
{
  lib,
  buildGoModule,
  minikube,
}:

buildGoModule rec {
  inherit (minikube)
    version
    src
    nativeBuildInputs
    buildInputs
    vendorHash
    doCheck
    ;

  pname = "docker-machine-kvm2";

  postPatch = minikube.postPatch + ''
    sed -i '/GOARCH=$*/d' Makefile
  '';

  buildPhase = ''
    make docker-machine-driver-kvm2 COMMIT=${src.rev}
  '';

  installPhase = ''
    install out/docker-machine-driver-kvm2 -Dt $out/bin
  '';

  meta = {
    homepage = "https://minikube.sigs.k8s.io/docs/drivers/kvm2";
    description = "KVM2 driver for docker-machine";
    mainProgram = "docker-machine-driver-kvm2";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [
      tadfisher
      atkinschang
    ];
    platforms = lib.platforms.linux;
  };
}
+3 −3
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@

buildGoModule rec {
  pname = "minikube";
  version = "1.37.0";
  version = "1.38.0";

  vendorHash = "sha256-xPTJMxKnEwZKKCc6QZxeL+03qM0oldOIKY4sPjSw3Ak=";
  vendorHash = "sha256-Sm/c5NhoLyd7+GFpOw6wyZNqEnJyREHgZf33U7g1LuE=";

  doCheck = false;

@@ -25,7 +25,7 @@ buildGoModule rec {
    owner = "kubernetes";
    repo = "minikube";
    rev = "v${version}";
    sha256 = "sha256-qyeGBL952YIloB/69W+QWosXxwIrazE0OMdVO6LshPk=";
    sha256 = "sha256-6kBygQ9agBcFJZxoiGb4KsPMz/jnZU54sGMWjF3mTuA=";
  };
  postPatch = ''
    substituteInPlace Makefile \
+0 −2
Original line number Diff line number Diff line
@@ -9976,8 +9976,6 @@ with pkgs;
  docker-machine-hyperkit =
    callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix
      { };
  docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };

  docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
  docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
  docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };