Skip to content

Commit

Permalink
Merge pull request #302945 from tiredofit/docker_26
Browse files Browse the repository at this point in the history
docker_26: init at 26.0.0
  • Loading branch information
wegank committed Apr 12, 2024
2 parents 8ff402c + 7ad95a2 commit d984f3a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
15 changes: 15 additions & 0 deletions pkgs/applications/virtualization/docker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
};

}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30554,7 +30554,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; };
Expand Down

0 comments on commit d984f3a

Please sign in to comment.