nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker_24: init at 24.0.5

Browse Source
This commit is contained in:
Mark Vainomaa 2023-04-08 18:47:59 +03:00
parent 927401d3c9
commit 3b6b64775d
No known key found for this signature in database
GPG Key ID: 1B3F9523B542D315
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/virtualization/docker/default.nix
View File

@ -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=";
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -30797,7 +30797,7 @@ with pkgs;
dnglab = callPackage ../tools/graphics/dnglab { };
inherit (callPackage ../applications/virtualization/docker {})
docker_20_10;
docker_20_10 docker_24;
docker = docker_20_10;
docker-client = docker.override { clientOnly = true; };