diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2024-03-13 19:47:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 19:47:25 -0500 |
| commit | c21a114480d155149586e368316a02cd653c2b5c (patch) | |
| tree | 2f678fed0b2ffa8a0f6ecb978522fda0b006d4ad | |
| parent | 8ed573783fdc2abcf97c01cfb60f6c622b8f23f9 (diff) | |
| parent | 5ee8407c8251566e073b4e0c4878c54d227a96c9 (diff) | |
| download | nixlib-c21a114480d155149586e368316a02cd653c2b5c.tar nixlib-c21a114480d155149586e368316a02cd653c2b5c.tar.gz nixlib-c21a114480d155149586e368316a02cd653c2b5c.tar.bz2 nixlib-c21a114480d155149586e368316a02cd653c2b5c.tar.lz nixlib-c21a114480d155149586e368316a02cd653c2b5c.tar.xz nixlib-c21a114480d155149586e368316a02cd653c2b5c.tar.zst nixlib-c21a114480d155149586e368316a02cd653c2b5c.zip | |
Merge pull request #291124 from aaronjheng/docker
docker_20_10: remove
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9b6bb0a48be3..a82a00fd5412 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -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}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c42e6dad6209..75eca5eb3052 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |