diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-28 15:30:15 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-28 22:14:42 +0000 |
| commit | 80e4dc93ce4bb109cd00a98f0b39151f09de9d9b (patch) | |
| tree | 64aa611a6a199dc0f40fc56d050d99e125e5c830 /nixpkgs/nixos/modules/module-list.nix | |
| parent | bfa679f5a8e9beff6008ea0e9d5eabfa68018e20 (diff) | |
| parent | 2436c27541b2f52deea3a4c1691216a02152e729 (diff) | |
| download | nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.gz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.bz2 nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.lz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.xz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.zst nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.zip | |
Merge commit '2436c27541b2f52deea3a4c1691216a02152e729'
Diffstat (limited to 'nixpkgs/nixos/modules/module-list.nix')
| -rw-r--r-- | nixpkgs/nixos/modules/module-list.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index 99b931ed2902..6321f6fc3ac3 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -939,6 +939,7 @@ ./virtualisation/anbox.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix + ./virtualisation/cri-o.nix ./virtualisation/docker.nix ./virtualisation/docker-containers.nix ./virtualisation/ecs-agent.nix |