cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #259638 from amaxine/docker_20.10.26

Browse source 
docker_20_10: 20.10.25 -> 20.10.26
This commit is contained in:
maxine 2023-10-09 17:55:32 +02:00 committed by GitHub
commit 1329cc64d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/virtualization/docker/default.nix
View file

@ -106,12 +106,6 @@ rec {
url = "https://github.com/moby/moby/pull/43136.patch"; url = "https://github.com/moby/moby/pull/43136.patch";
hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; 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";
hash = "sha256-zxFh/bI6+INOYSg6QFs0S9rdl9Z21KUIZFmzpNVjpSA=";
})
]; ];
postPatch = '' postPatch = ''
@ -190,14 +184,6 @@ rec {
glibc.static glibc.static
]; ];
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";
hash = "sha256-F4ueSbdBk1w8OqC4Dgh8+4Ql4zTjehaM368ET7k6Yx8=";
})
];
postPatch = '' postPatch = ''
patchShebangs man scripts/build/ patchShebangs man scripts/build/
substituteInPlace ./scripts/build/.variables --replace "set -eu" "" substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
@ -283,15 +269,15 @@ rec {
# Get revisions from # Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = callPackage dockerGen rec { docker_20_10 = callPackage dockerGen rec {
version = "20.10.25"; version = "20.10.26";
cliRev = "v${version}"; cliRev = "v${version}";
cliHash = "sha256-Wi/NHn8erqvKEVEJqkc99cO/sfPHptwMT44Savcuw2M="; cliHash = "sha256-EPhsng0kLnweVbC8ZnH0NK1/yHlYSA5Sred4rWJX/Gs=";
mobyRev = "v${version}"; mobyRev = "v${version}";
mobyHash = "sha256-trJjQMYF/Uog7nvUlELyUYbsTPGz8Rn21v1/V5xhu+A="; mobyHash = "sha256-IJ7m2mQnsLiom0EuZLpuLY6fYEko7rEy35igJv1AY04=";
runcRev = "v1.1.5"; runcRev = "v1.1.8";
runcHash = "sha256-r5as3hb0zt+XPfxAPeH+YIc/n6IRlscPOZMGfhVE5C4="; runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";
containerdRev = "v1.6.20"; containerdRev = "v1.6.22";
containerdHash = "sha256-Nd3S6hmvA8LBFUN4XaQJMApbmwGIp6GTnFQimnYagZg="; containerdHash = "sha256-In7OkK3xm7Cz3H1jzG9b4tsZbmo44QCq8pNU+PPy8dY=";
tiniRev = "v0.19.0"; tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
}; };