Commit f3fb1d8ca2ca

@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  name = "buildx-${version}";
+  version = "0.5.1";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/docker/buildx";
+  subPackages = [ "cmd/buildx" ];
+
+  buildFlagsArray = let t = "${goPackagePath}/version"; in
+    ''
+      -ldflags=
+        -X ${t}.Version=${version}
+    '';
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "docker";
+    repo = "buildx";
+    sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk";
+  };
+  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;
+  };
+}

@@ -115,6 +115,7 @@ rec {
 
   # Upstream
   buildkit = pkgs.callPackage ./buildkit { };
+  buildx = pkgs.callPackage ./buildx { };
   inherit (pkgs.callPackage ./containerd { })
     containerd_1_2
     containerd_1_3

@@ -286,6 +286,8 @@
 
             manifest-tool = pkgs.callPackage ./pkgs/manifest-tool { };
             ko = pkgs.callPackage ./pkgs/ko { };
+            buildx = pkgs.callPackage ./pkgs/buildx { };
+            buildkit = pkgs.callPackage ./pkgs/buildkit { };
           } // optionalAttrs (system == "x86_64-linux") {
             # OpenShift
             inherit (pkgs.callPackage ./pkgs/oc { })