From 9f39ea5320e068ee53975bbd321a9785056a3d88 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 15 Jun 2025 18:31:28 +0200 Subject: [PATCH] docker_26: drop docker 26.x is no longer maintained since February 2025[1]. [1] https://github.com/moby/moby/pull/49468 --- .../applications/virtualization/docker/default.nix | 14 -------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index fd980618de81..2bc586854351 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -375,20 +375,6 @@ rec { tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; - docker_26 = callPackage dockerGen rec { - version = "26.1.5"; - cliRev = "v${version}"; - cliHash = "sha256-UlN+Uc0YHhLyu14h5oDBXP4K9y2tYKPOIPTGZCe4PVY="; - mobyRev = "v${version}"; - mobyHash = "sha256-6Hx7GnA7P6HqDlnGoc+HpPHSl69XezwAEGbvWYUVQlE="; - runcRev = "v1.1.12"; - runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; - containerdRev = "v1.7.18"; - containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; - tiniRev = "v0.19.0"; - tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; - }; - docker_27 = callPackage dockerGen rec { version = "27.5.1"; cliRev = "v${version}"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fd2041c53b25..49eb8b34f7ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -552,6 +552,7 @@ mapAliases { dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 docker_24 = throw "'docker_24' has been removed because it has been unmaintained since June 2024. Use docker_25 or newer instead."; # Added 2024-12-21 + docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96b2c89bebe3..7d2dbe6d76f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12131,7 +12131,6 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker { }) docker_25 - docker_26 docker_27 docker_28 ;