Skip to content

Commit ba84d7f

Browse files
committed
docker: cleanup derivation of old versionOlder
1 parent 7e9020d commit ba84d7f

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

pkgs/applications/virtualization/docker/default.nix

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,6 @@ rec {
119119

120120
extraUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
121121

122-
patches = lib.optionals (lib.versionOlder version "23") [
123-
# This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver.
124-
# It could be removed when a version incorporating this patch is released.
125-
(fetchpatch {
126-
name = "buildkit-zfs.patch";
127-
url = "https://github.com/moby/moby/pull/43136.patch";
128-
hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
129-
})
130-
];
131-
132122
postPatch = ''
133123
patchShebangs hack/make.sh hack/make/ hack/with-go-mod.sh
134124
'';
@@ -203,7 +193,7 @@ rec {
203193
makeWrapper pkg-config go-md2man go libtool installShellFiles
204194
];
205195

206-
buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.hostPlatform.isLinux) [
196+
buildInputs = plugins ++ lib.optionals (stdenv.hostPlatform.isLinux) [
207197
glibc
208198
glibc.static
209199
];
@@ -231,7 +221,7 @@ rec {
231221
232222
'';
233223

234-
outputs = ["out"] ++ lib.optional (lib.versionOlder version "23") "man";
224+
outputs = ["out"];
235225

236226
installPhase = ''
237227
install -Dm755 ./build/docker $out/libexec/docker/docker
@@ -252,18 +242,6 @@ rec {
252242
installShellCompletion --bash ./contrib/completion/bash/docker
253243
installShellCompletion --fish ./contrib/completion/fish/docker.fish
254244
installShellCompletion --zsh ./contrib/completion/zsh/_docker
255-
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && lib.versionOlder version "23") ''
256-
# Generate man pages from cobra commands
257-
echo "Generate man pages from cobra"
258-
mkdir -p ./man/man1
259-
go build -o ./gen-manpages github.com/docker/cli/man
260-
./gen-manpages --root . --target ./man/man1
261-
'' + lib.optionalString (lib.versionOlder version "23") ''
262-
# Generate legacy pages from markdown
263-
echo "Generate legacy manpages"
264-
./man/md2man-all.sh -q
265-
266-
installManPage man/*/*.[1-9]
267245
'';
268246

269247
passthru = {

0 commit comments

Comments
 (0)