about summary refs log tree commit diff
path: root/nixos/modules/module-list.nix
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-04-20 12:31:07 +0100
committeradisbladis <adisbladis@gmail.com>2020-05-04 13:47:25 +0100
commit2f7747526cc80844a506c4aa14706429324be157 (patch)
treee5e61dd3873c02c23cced6afbc79c7be45294d8e /nixos/modules/module-list.nix
parent2fb5dac372fedd482ef3c65b608810bb7dd45083 (diff)
downloadnixlib-2f7747526cc80844a506c4aa14706429324be157.tar
nixlib-2f7747526cc80844a506c4aa14706429324be157.tar.gz
nixlib-2f7747526cc80844a506c4aa14706429324be157.tar.bz2
nixlib-2f7747526cc80844a506c4aa14706429324be157.tar.lz
nixlib-2f7747526cc80844a506c4aa14706429324be157.tar.xz
nixlib-2f7747526cc80844a506c4aa14706429324be157.tar.zst
nixlib-2f7747526cc80844a506c4aa14706429324be157.zip
nixos/docker-containers: Rename to virtualisation.oci-containers.containers.
And allow the runtime to be configurable via the
`virtualisation.oci-containers.backend` option.

Valid choices are "podman" and "docker".
Diffstat (limited to 'nixos/modules/module-list.nix')
-rw-r--r--nixos/modules/module-list.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0cd17775e516..28f536056bf1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -984,9 +984,9 @@
   ./virtualisation/container-config.nix
   ./virtualisation/containers.nix
   ./virtualisation/nixos-containers.nix
+  ./virtualisation/oci-containers.nix
   ./virtualisation/cri-o.nix
   ./virtualisation/docker.nix
-  ./virtualisation/docker-containers.nix
   ./virtualisation/ecs-agent.nix
   ./virtualisation/libvirtd.nix
   ./virtualisation/lxc.nix