diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2025-04-04 17:29:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-04 17:29:32 +0200 |
| commit | c256a1ed401398d20f44dc1c24fc53bf53b4cff0 (patch) | |
| tree | 18d18d4974844fc940a0f054e6983d052900362f | |
| parent | [release-24.11] flake: fix `nix flake check --all-systems --no-build` again (... (diff) | |
| parent | docker_27: sync runc and containerd versions with upstream (diff) | |
| download | nixpkgs-c256a1ed401398d20f44dc1c24fc53bf53b4cff0.tar.gz | |
[24.11] docker_27: 27.3.1 -> 27.5.1 (#396059)
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index da6883a4ac70..7ef6b9ed0ada 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -32,6 +32,7 @@ rec { runc, tini, libtool, + bash, sqlite, iproute2, docker-buildx, @@ -82,6 +83,10 @@ rec { hash = runcHash; }; + preBuild = '' + substituteInPlace Makefile --replace-warn "/bin/bash" "${lib.getExe bash}" + ''; + # docker/runc already include these patches / are not applicable patches = [ ]; }; @@ -433,15 +438,15 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.3.1"; + version = "27.5.1"; cliRev = "v${version}"; - cliHash = "sha256-Iurud1BwswGZCFgJ04/wl1U9AKcsXDmzFXLFCrjfc0Y="; + cliHash = "sha256-7laxRfssh2aGfJeZI0PsJ/MCiy2npigSmCa1SUlWY4s="; mobyRev = "v${version}"; - mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE="; - runcRev = "v1.1.14"; - runcHash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc="; - containerdRev = "v1.7.22"; - containerdHash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; + mobyHash = "sha256-q+VCJZ93jvPJQE0xn89prH/6spsarVY3VUEmgwyMxU4="; + runcRev = "v1.2.4"; + runcHash = "sha256-LdYCMxdqDP7rKo6Ek/B1DE6QvUFrltbSJVggkVkXQZo="; + containerdRev = "v1.7.25"; + containerdHash = "sha256-T0F5bwxSCqa4Czs/W01NaAlJJFvgrzkBC1y/r+muivA="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; |