From 57476455c447bfc88a04ede207d3dca75b5eda59 Mon Sep 17 00:00:00 2001
From: Roman Balashov <ubermailbox@protonmail.ch>
Date: Thu, 2 Oct 2025 01:46:15 +0300
Subject: [PATCH 1/2] maintainers: add Roman Balashov

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 23e836c8fa7a..9b44a5cd17f4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13827,6 +13827,13 @@
     githubId = 1903418;
     name = "Kovacsics Robert";
   };
+  kozm9000 = {
+    email = "ubermailbox@protonmail.ch";
+    github = "kozm9000";
+    githubId = 80588292;
+    name = "Roman Balashov";
+    keys = [ { fingerprint = "E5A5 700D 96ED 42F2 13D4  D16B 2E79 1278 5DDB 96B5"; } ];
+  };
   kpbaks = {
     email = "kristoffer.pbs@gmail.com";
     github = "kpbaks";

From 278b84e1e5f9668673065f47c35c1be50b82a113 Mon Sep 17 00:00:00 2001
From: Roman Balashov <ubermailbox@protonmail.ch>
Date: Thu, 2 Oct 2025 05:33:10 +0300
Subject: [PATCH 2/2] vscode-extensions.docker.docker: init at 0.17.0

---
 .../editors/vscode/extensions/default.nix     |  2 +
 .../extensions/docker.docker/default.nix      | 48 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/docker.docker/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index f4a4e1ae49f6..11d8eb630aad 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1366,6 +1366,8 @@ let
         };
       };
 
+      docker.docker = callPackage ./docker.docker { };
+
       donjayamanne.githistory = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "githistory";
diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
new file mode 100644
index 000000000000..744005cb66d3
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
@@ -0,0 +1,48 @@
+{
+  stdenv,
+  lib,
+  vscode-utils,
+}:
+
+let
+  supported = {
+    x86_64-linux = {
+      hash = "sha256-2m1hVQ497zQs2pmk+F+5thO4cz7dP4dDEPznPBqKfX0=";
+      arch = "linux-x64";
+    };
+    x86_64-darwin = {
+      hash = "sha256-U2BcDUiper4chL8rF4ZUSos7erfXaq1LNqYYsRe2GDk=";
+      arch = "darwin-x64";
+    };
+    aarch64-linux = {
+      hash = "sha256-qYdYmPZPlf++cJWLbhvqeO0uePbAJE4hL2bVYlKbk0c=";
+      arch = "linux-arm64";
+    };
+    aarch64-darwin = {
+      hash = "sha256-oN3CWc/OLbeuyKfdPoh26yUQzH3d6YfpxacByWM43qk=";
+      arch = "darwin-arm64";
+    };
+  };
+
+  base =
+    supported.${stdenv.hostPlatform.system}
+      or (throw "unsupported platform ${stdenv.hostPlatform.system}");
+
+in
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = base // {
+    publisher = "docker";
+    name = "docker";
+    version = "0.17.0";
+  };
+
+  meta = {
+    description = "Official Docker DX (Developer Experience) extension. Edit smarter, ship faster with an enhanced Docker-development experience.";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=docker.docker";
+    homepage = "https://github.com/docker/vscode-extension#readme";
+    changelog = "https://marketplace.visualstudio.com/items/docker.docker/changelog";
+    license = lib.licenses.asl20;
+    platforms = builtins.attrNames supported;
+    maintainers = [ lib.maintainers.kozm9000 ];
+  };
+}