lol

Merge pull request #101752 from petabyteboy/feature/docker-19-03-13

docker: 19.03.12 -> 19.03.13

authored by

Martin Weinelt and committed by
GitHub
91e28cfb 3c7890d4

+11 -5
+11 -5
pkgs/applications/virtualization/docker/default.nix
··· 29 29 patches = []; 30 30 }); 31 31 32 - docker-containerd = containerd.overrideAttrs (oldAttrs: { 32 + docker-containerd = let 33 + withlibseccomp = lib.versionAtLeast version "19.03"; 34 + in containerd.overrideAttrs (oldAttrs: { 33 35 name = "docker-containerd-${version}"; 34 36 inherit version; 35 37 src = fetchFromGitHub { ··· 38 40 rev = containerdRev; 39 41 sha256 = containerdSha256; 40 42 }; 43 + # This should be removed once Docker uses containerd >=1.4 44 + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig; 45 + buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp; 41 46 }); 42 47 43 48 docker-tini = tini.overrideAttrs (oldAttrs: { ··· 210 215 }; 211 216 212 217 docker_19_03 = makeOverridable dockerGen rec { 213 - version = "19.03.12"; 218 + version = "19.03.13"; 214 219 rev = "v${version}"; 215 - sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7"; 220 + sha256 = "139qqy8jiz1phnngknpa7c1nk9iqwd3hcc9as8x50p1vnycwzr3f"; 216 221 runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 217 222 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; 218 - containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 219 - containerdSha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn"; 223 + # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above 224 + containerdRev = "8fba4e9a7d01810a393d5d25a3621dc101981175"; # v1.3.7 225 + containerdSha256 = "10zy507ajslizicagb64dvbs7wmw0j4x3hdhygbdh4g2nv3mgjb7"; 220 226 tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 221 227 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; 222 228 };