From 7ad95a2d241ab855e8613bda94662452e3dd4ddc Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Tue, 9 Apr 2024 14:26:33 -0700 Subject: [PATCH] docker_26: init at 26.0.0 --- .../virtualization/docker/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f91f7d6df3df..d32ae07d365a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -306,4 +306,19 @@ rec { tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; + + docker_26 = callPackage dockerGen rec { + version = "26.0.0"; + cliRev = "v${version}"; + cliHash = "sha256-jGg/AVnIzI8e+DdF0uKlSZApRxcwuOjCQpfnBaCY4fI="; + mobyRev = "v${version}"; + mobyHash = "sha256-cDlRVdQNzH/X2SJUYHK1QLUHlKQtSyRYCVbz3wPx1ZM="; + runcRev = "v1.1.12"; + runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; + containerdRev = "v1.7.13"; + containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef3a450b974..692f2cfe8f9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30584,7 +30584,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_24 docker_25; + docker_24 docker_25 docker_26; docker = docker_24; docker-client = docker.override { clientOnly = true; };