diff options
| author | Mark Vainomaa <mikroskeem@mikroskeem.eu> | 2023-04-08 18:47:59 +0300 |
|---|---|---|
| committer | Mark Vainomaa <mikroskeem@mikroskeem.eu> | 2023-08-01 23:21:48 +0300 |
| commit | 3b6b64775dda990b9092205ff7a12b9f4b702417 (patch) | |
| tree | a4b00a58e418261da48178e700477e7fa5423254 /pkgs/applications/virtualization/docker/default.nix | |
| parent | 927401d3c9c309e4aa0bbebd03a461824a87adbf (diff) | |
| download | nixpkgs-3b6b64775dda990b9092205ff7a12b9f4b702417.tar nixpkgs-3b6b64775dda990b9092205ff7a12b9f4b702417.tar.gz nixpkgs-3b6b64775dda990b9092205ff7a12b9f4b702417.tar.bz2 nixpkgs-3b6b64775dda990b9092205ff7a12b9f4b702417.tar.lz nixpkgs-3b6b64775dda990b9092205ff7a12b9f4b702417.tar.xz nixpkgs-3b6b64775dda990b9092205ff7a12b9f4b702417.tar.zst nixpkgs-3b6b64775dda990b9092205ff7a12b9f4b702417.zip | |
docker_24: init at 24.0.5
Diffstat (limited to 'pkgs/applications/virtualization/docker/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index cf5698c5bbd..ac6ca712b4d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -105,6 +105,7 @@ rec { url = "https://github.com/moby/moby/pull/43136.patch"; hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; }) + ] ++ lib.optionals (lib.versionOlder version "23.0.5") [ (fetchpatch { name = "fix-issue-with-go-1.20.6.patch"; url = "https://github.com/moby/moby/pull/45972.patch"; @@ -188,7 +189,7 @@ rec { ++ lib.optional withSeccomp libseccomp ++ plugins; - patches = [ + patches = lib.optionals (lib.versionOlder version "23.0.5") [ (fetchpatch { name = "fix-issue-with-go-1.20.6.patch"; url = "https://github.com/docker/cli/pull/4441.patch"; @@ -292,4 +293,18 @@ rec { tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; + + docker_24 = callPackage dockerGen rec { + version = "24.0.5"; + cliRev = "v${version}"; + cliHash = "sha256-u1quVGTx/p8BDyRn33vYyyuE5BOhWMnGQ5uVX0PZ5mg="; + mobyRev = "v${version}"; + mobyHash = "sha256-JQjRz1fHZlQRkNw/R8WWLV8caN3/U3mrKKQXbZt2crU="; + runcRev = "v1.1.8"; + runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; + containerdRev = "v1.7.1"; + containerdHash = "sha256-WwedtcsrDQwMQcKFO5nnPiHyGJpl5hXZlmpbBe1/ftY="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; } |