diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-21 18:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-21 18:01:28 +0000 |
| commit | 32de4bcbf078df9a8dedbaa036ef55bb68d71839 (patch) | |
| tree | fd4d0dec151e258566d9dab98ec6c30a36b497f9 /pkgs/applications/virtualization | |
| parent | a3599a93ae4cea3bcfc3accf138e78370fd4979f (diff) | |
| parent | 6ff18cf32981d0b679a46fe935dde1d962c90c27 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/appvm/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/conmon/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 10 |
3 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/appvm/default.nix b/pkgs/applications/virtualization/appvm/default.nix index e96a8b7d46d78..c71236d127b68 100644 --- a/pkgs/applications/virtualization/appvm/default.nix +++ b/pkgs/applications/virtualization/appvm/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nix , virt-viewer -, fetchpatch , makeWrapper }: let diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index aa3675ac2001b..a6931f2e709f8 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , pkg-config , glib , glibc diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index bb18a42a021ae..7556ba47b7228 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -308,15 +308,15 @@ rec { }; docker_26 = callPackage dockerGen rec { - version = "26.0.0"; + version = "26.1.3"; cliRev = "v${version}"; - cliHash = "sha256-jGg/AVnIzI8e+DdF0uKlSZApRxcwuOjCQpfnBaCY4fI="; + cliHash = "sha256-xE+g9Gtza4oAIlGUzDmjrqJa42bEkpbKbL2fsFlYzpY="; mobyRev = "v${version}"; - mobyHash = "sha256-cDlRVdQNzH/X2SJUYHK1QLUHlKQtSyRYCVbz3wPx1ZM="; + mobyHash = "sha256-s4hOvYV2+wDNKs4iFw6OflK+nemvqNhmfFURzhWaUzY="; runcRev = "v1.1.12"; runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; - containerdRev = "v1.7.13"; - containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; + containerdRev = "v1.7.15"; + containerdHash = "sha256-qLrPLGxsUmgEscrhyl+1rJ0k7c9ibKnpMpsJPD4xDZU="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; |