From 7d03f1aa9f1b356064c6f12d619498a264df334b Mon Sep 17 00:00:00 2001
From: Calum MacRae <hi@cmacr.ae>
Date: Mon, 8 Feb 2021 21:45:02 +0000
Subject: [PATCH 1/2] nixos/cri-o: add aufs, devmapper, and zfs to
 storageDrivers

Update the storageDrivers option to align with the supported drivers, as listed here:
https://github.com/containers/storage/blob/master/docs/containers-storage.conf.5.md#storage-table
---
 nixos/modules/virtualisation/cri-o.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 8d352e36ef99..d3cb06ea21b4 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -4,7 +4,10 @@ with lib;
 let
   cfg = config.virtualisation.cri-o;
 
-  crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; });
+  crioPackage = pkgs.cri-o.override {
+    extraPackages = cfg.extraPackages
+      ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;
+  };
 
 in
 {
@@ -20,7 +23,7 @@ in
     enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)";
 
     storageDriver = mkOption {
-      type = types.enum [ "btrfs" "overlay" "vfs" ];
+      type = types.enum [ "aufs" "btrfs" "devmapper" "overlay" "vfs" "zfs" ];
       default = "overlay";
       description = "Storage driver to be used";
     };

From 8ae1412f8e881797b2b22e5425a97138fcd5d428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Jan 2023 23:25:56 +0100
Subject: [PATCH 2/2] cri-o: add conntrack-tools to wrapper

---
 pkgs/applications/virtualization/cri-o/wrapper.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix
index 5aca291a6018..d4260eb18988 100644
--- a/pkgs/applications/virtualization/cri-o/wrapper.nix
+++ b/pkgs/applications/virtualization/cri-o/wrapper.nix
@@ -5,6 +5,7 @@
 , extraPackages ? []
 , cri-o
 , runc # Default container runtime
+, conntrack-tools
 , crun # Container runtime (default with cgroups v2 for podman/buildah)
 , conmon # Container runtime monitor
 , util-linux # nsenter
@@ -17,6 +18,7 @@ let
 
   binPath = lib.makeBinPath ([
     runc
+    conntrack-tools
     crun
     conmon
     util-linux