public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker: 19.03.12 -> 19.03.13 

Added libseccomp and pkgconfig inputs to containerd, because 1.3.x requires them.
However containerd 1.2.x and 1.4.x do not.
This commit is contained in:
Milan Pässler 2020-10-26 12:28:43 +01:00
parent d2f8c8079c
commit 0dc4ced3eb
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,9 @@ rec {
patches = []; patches = [];
}); });
docker-containerd = containerd.overrideAttrs (oldAttrs: { docker-containerd = let
withlibseccomp = lib.versionAtLeast version "19.03";
in containerd.overrideAttrs (oldAttrs: {
name = "docker-containerd-${version}"; name = "docker-containerd-${version}";
inherit version; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
@ -38,6 +40,9 @@ rec {
rev = containerdRev; rev = containerdRev;
sha256 = containerdSha256; sha256 = containerdSha256;
}; };
# This should be removed once Docker uses containerd >=1.4
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig;
buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp;
}); });
docker-tini = tini.overrideAttrs (oldAttrs: { docker-tini = tini.overrideAttrs (oldAttrs: {
@ -210,13 +215,14 @@ rec {
}; };
docker_19_03 = makeOverridable dockerGen rec { docker_19_03 = makeOverridable dockerGen rec {
version = "19.03.12"; version = "19.03.13";
rev = "v${version}"; rev = "v${version}";
sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7"; sha256 = "139qqy8jiz1phnngknpa7c1nk9iqwd3hcc9as8x50p1vnycwzr3f";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above
containerdSha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn"; containerdRev = "8fba4e9a7d01810a393d5d25a3621dc101981175"; # v1.3.7
containerdSha256 = "10zy507ajslizicagb64dvbs7wmw0j4x3hdhygbdh4g2nv3mgjb7";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
}; };