Unverified Commit c21a1144 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #291124 from aaronjheng/docker 

docker_20_10: remove
parents 8ed57378 5ee8407c

pkgs/applications/virtualization/docker/default.nix

+0 −14
Original line number Diff line number Diff line
@@ -279,20 +279,6 @@ rec { 


  # Get revisions from

  # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*

  docker_20_10 = callPackage dockerGen rec {

    version = "20.10.26";

    cliRev = "v${version}";

    cliHash = "sha256-EPhsng0kLnweVbC8ZnH0NK1/yHlYSA5Sred4rWJX/Gs=";

    mobyRev = "v${version}";

    mobyHash = "sha256-IJ7m2mQnsLiom0EuZLpuLY6fYEko7rEy35igJv1AY04=";

    runcRev = "v1.1.8";

    runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";

    containerdRev = "v1.6.22";

    containerdHash = "sha256-In7OkK3xm7Cz3H1jzG9b4tsZbmo44QCq8pNU+PPy8dY=";

    tiniRev = "v0.19.0";

    tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";

  };



  docker_24 = callPackage dockerGen rec {

    version = "24.0.5";

    cliRev = "v${version}";

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -30776,7 +30776,7 @@ with pkgs; 
  dnglab = callPackage ../tools/graphics/dnglab { };















  inherit (callPackage ../applications/virtualization/docker {})













    docker_20_10 docker_24 docker_25;













    docker_24 docker_25;





























  docker = docker_24;















  docker-client = docker.override { clientOnly = true; };