summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Vainomaa <mikroskeem@mikroskeem.eu>2023-06-01 19:21:33 +0300
committerMark Vainomaa <mikroskeem@mikroskeem.eu>2023-08-01 23:21:49 +0300
commitc13044c93c59db741c53f18086bcb441967bcf35 (patch)
treef3a486b6f385a9583775177bc9e0748f1c0baa23
parent3b6b64775dda990b9092205ff7a12b9f4b702417 (diff)
downloadnixpkgs-c13044c93c59db741c53f18086bcb441967bcf35.tar
nixpkgs-c13044c93c59db741c53f18086bcb441967bcf35.tar.gz
nixpkgs-c13044c93c59db741c53f18086bcb441967bcf35.tar.bz2
nixpkgs-c13044c93c59db741c53f18086bcb441967bcf35.tar.lz
nixpkgs-c13044c93c59db741c53f18086bcb441967bcf35.tar.xz
nixpkgs-c13044c93c59db741c53f18086bcb441967bcf35.tar.zst
nixpkgs-c13044c93c59db741c53f18086bcb441967bcf35.zip
docker: zfs patch is in >= 23.x
-rw-r--r--pkgs/applications/virtualization/docker/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index ac6ca712b4d..3b0ad20bf4b 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -97,7 +97,7 @@ rec {
 
       extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
 
-      patches = [
+      patches = lib.optionals (lib.versionOlder version "23") [
         # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver.
         # It could be removed when a version incorporating this patch is released.
         (fetchpatch {