Commit 45ab6d11c704

@@ -1,28 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule }:
-
-buildGoModule rec {
-  name = "buildkit-${version}";
-  version = "0.9.3";
-  rev = "v${version}";
-
-  subPackages = [ "cmd/buildctl" "cmd/buildkitd" ];
-
-  ldflags = [
-    "-X github.com/moby/buildkit/version.Version=${version}"
-  ];
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "moby";
-    repo = "buildkit";
-    sha256 = "sha256-xjuHMjJjA4sx2Hrr6tPpvKtSmhGZ3AZka733DLxmYfk=";
-  };
-  vendorSha256 = null;
-  doCheck = false;
-
-  meta = {
-    description = "concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
-    homepage = https://github.com/moby/buildkit;
-    license = lib.licenses.asl20;
-  };
-}

@@ -1,28 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule }:
-
-buildGoModule rec {
-  name = "buildx-${version}";
-  version = "0.7.1";
-  rev = "v${version}";
-
-  subPackages = [ "cmd/buildx" ];
-
-  ldflags = [
-    "-X github.com/docker/buildx/version.Version=${version}"
-  ];
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "docker";
-    repo = "buildx";
-    sha256 = "sha256-5EV0Rw1+ufxQ1wmQ0EJXQ7HVtXVbB4do/tet0QFRi08=";
-  };
-  vendorSha256 = null;
-  doCheck = false;
-
-  meta = {
-    description = "Docker CLI plugin for extended build capabilities with buildkit";
-    homepage = https://github.com/docker/buildx;
-    license = lib.licenses.asl20;
-  };
-}

@@ -32,9 +32,5 @@ rec {
 
   manifest-tool = pkgs.callPackage ./manifest-tool { };
 
-  # Upstream
-  buildkit = pkgs.callPackage ./buildkit { };
-  buildx = pkgs.callPackage ./buildx { };
-
   adi1090x-plymouth = pkgs.callPackage ./adi1090x-plymouth { };
 }

@@ -112,7 +112,7 @@ in
         };
       };
       environment.systemPackages = with pkgs; [
-        my.buildx
+        buildx
       ];
       networking.firewall.trustedInterfaces = [ "docker0" "podman" ];
     })

@@ -70,7 +70,7 @@ in
       };
     };
     environment.systemPackages = with pkgs; [
-      my.buildx
+      buildx
     ];
     networking.firewall.trustedInterfaces = [ "docker0" ];
   };

@@ -65,7 +65,7 @@ in
       {"features":{"buildkit": true}, "insecure-registries": ["172.30.0.0/16", "192.168.12.0/16", "massimo.home:5000", "r.svc.home:5000", "r.svc.home" ]}
     '';
     environment.systemPackages = with pkgs; [
-      my.buildx
+      buildx
     ];
     networking.firewall.trustedInterfaces = [ "docker0" ];
   };