From 2b9a23c16e2e9737a88b39e34d15c3cb7f722ebd Mon Sep 17 00:00:00 2001
From: Sebastian Kowalak <contact+nix@skowalak.de>
Date: Mon, 26 Oct 2026 13:05:14 +0100
Subject: [PATCH] docker-buildx: 0.35.0 -> 0.38.1, use finalAttrs

Use finalAttrs instead of rec, add versionCheckHook, use tag instead of
rev, remove redundant -s and -w ldflags, remove version.Package because
it was setting the default value hardcoded inside buildx, move modified
installPhase to postInstall hook, add passthru.updateScript.

Changelog: https://github.com/docker/buildx/releases/tag/v0.38.1
Changelog: https://github.com/docker/buildx/releases/tag/v0.38.0
Changelog: https://github.com/docker/buildx/releases/tag/v0.37.2
Changelog: https://github.com/docker/buildx/releases/tag/v0.37.1
Changelog: https://github.com/docker/buildx/releases/tag/v0.37.0
Changelog: https://github.com/docker/buildx/releases/tag/v0.36.1
Changelog: https://github.com/docker/buildx/releases/tag/v0.36.0
Diff: https://github.com/docker/buildx/compare/v0.35.0...v0.38.1
---
 pkgs/by-name/do/docker-buildx/package.nix | 41 +++++++++++++----------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/do/docker-buildx/package.nix b/pkgs/by-name/do/docker-buildx/package.nix
index 10ec200adc03..73f865090971 100644
--- a/pkgs/by-name/do/docker-buildx/package.nix
+++ b/pkgs/by-name/do/docker-buildx/package.nix
@@ -2,47 +2,52 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "docker-buildx";
-  version = "0.35.0";
+  version = "0.38.1";
+
+  subPackages = [ "cmd/buildx" ];
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
-    rev = "v${version}";
-    hash = "sha256-Q4f7tejn0LO4eiEq+ske53WJ1oe5JxtCVZA2Im+7dv8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-prQ+ab+TMK6vZ5Kk9ozBd8Y5/ek1Ia8HgoBWDSYkdPU=";
   };
 
-  doCheck = false;
-
   vendorHash = null;
 
   ldflags = [
-    "-w"
-    "-s"
-    "-X github.com/docker/buildx/version.Package=github.com/docker/buildx"
-    "-X github.com/docker/buildx/version.Version=v${version}"
+    "-X github.com/docker/buildx/version.Version=v${finalAttrs.version}"
   ];
 
-  installPhase = ''
-    runHook preInstall
-    install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx
+  doCheck = false;
 
-    mkdir -p $out/bin
-    ln -s $out/libexec/docker/cli-plugins/docker-buildx $out/bin/docker-buildx
-    runHook postInstall
+  postInstall = ''
+    mkdir -p $out/libexec/docker/cli-plugins
+    mv $out/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx
+    ln -s ../libexec/docker/cli-plugins/docker-buildx $out/bin/docker-buildx
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Docker CLI plugin for extended build capabilities with BuildKit";
-    mainProgram = "docker-buildx";
     homepage = "https://github.com/docker/buildx";
+    changelog = "https://github.com/docker/buildx/releases/tag/${finalAttrs.src.tag}";
+    mainProgram = "docker-buildx";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       ivan-babrou
       developer-guy
     ];
   };
-}
+})