docker_24: init at 24.0.5
This commit is contained in:
parent
927401d3c9
commit
3b6b64775d
|
@ -105,6 +105,7 @@ rec {
|
||||||
url = "https://github.com/moby/moby/pull/43136.patch";
|
url = "https://github.com/moby/moby/pull/43136.patch";
|
||||||
hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
|
hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
|
||||||
})
|
})
|
||||||
|
] ++ lib.optionals (lib.versionOlder version "23.0.5") [
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "fix-issue-with-go-1.20.6.patch";
|
name = "fix-issue-with-go-1.20.6.patch";
|
||||||
url = "https://github.com/moby/moby/pull/45972.patch";
|
url = "https://github.com/moby/moby/pull/45972.patch";
|
||||||
|
@ -188,7 +189,7 @@ rec {
|
||||||
++ lib.optional withSeccomp libseccomp
|
++ lib.optional withSeccomp libseccomp
|
||||||
++ plugins;
|
++ plugins;
|
||||||
|
|
||||||
patches = [
|
patches = lib.optionals (lib.versionOlder version "23.0.5") [
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "fix-issue-with-go-1.20.6.patch";
|
name = "fix-issue-with-go-1.20.6.patch";
|
||||||
url = "https://github.com/docker/cli/pull/4441.patch";
|
url = "https://github.com/docker/cli/pull/4441.patch";
|
||||||
|
@ -292,4 +293,18 @@ rec {
|
||||||
tiniRev = "v0.19.0";
|
tiniRev = "v0.19.0";
|
||||||
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
|
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=";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -30797,7 +30797,7 @@ with pkgs;
|
||||||
dnglab = callPackage ../tools/graphics/dnglab { };
|
dnglab = callPackage ../tools/graphics/dnglab { };
|
||||||
|
|
||||||
inherit (callPackage ../applications/virtualization/docker {})
|
inherit (callPackage ../applications/virtualization/docker {})
|
||||||
docker_20_10;
|
docker_20_10 docker_24;
|
||||||
|
|
||||||
docker = docker_20_10;
|
docker = docker_20_10;
|
||||||
docker-client = docker.override { clientOnly = true; };
|
docker-client = docker.override { clientOnly = true; };
|
||||||
|
|
Loading…
Reference in a new issue