diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-08-29 15:40:47 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-08-30 17:05:48 +1000 |
| commit | 464944c3f4f13175386812a2dcf18f79e33b29c4 (patch) | |
| tree | f770ea1d9b8fb75da2296c9f7223947ec51c76e9 /nixos | |
| parent | 5fcabeef0b933e2ac3869a4aac5975d888125439 (diff) | |
| download | nixpkgs-464944c3f4f13175386812a2dcf18f79e33b29c4.tar nixpkgs-464944c3f4f13175386812a2dcf18f79e33b29c4.tar.gz nixpkgs-464944c3f4f13175386812a2dcf18f79e33b29c4.tar.bz2 nixpkgs-464944c3f4f13175386812a2dcf18f79e33b29c4.tar.lz nixpkgs-464944c3f4f13175386812a2dcf18f79e33b29c4.tar.xz nixpkgs-464944c3f4f13175386812a2dcf18f79e33b29c4.tar.zst nixpkgs-464944c3f4f13175386812a2dcf18f79e33b29c4.zip | |
nixos/{containers,cri-o/podman}: drop outdated remove/rename
these have been around for a few release cycles
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 14 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/podman/default.nix | 1 |
3 files changed, 0 insertions, 19 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 956844352f9..fb9c19d79c1 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -11,20 +11,6 @@ in maintainers = [ ] ++ lib.teams.podman.members; }; - - imports = [ - ( - lib.mkRemovedOptionModule - [ "virtualisation" "containers" "users" ] - "All users with `isNormalUser = true` set now get appropriate subuid/subgid mappings." - ) - ( - lib.mkRemovedOptionModule - [ "virtualisation" "containers" "containersConf" "extraConfig" ] - "Use virtualisation.containers.containersConf.settings instead." - ) - ]; - options.virtualisation.containers = { enable = diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 3c9b0a061d2..d079626a700 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -11,10 +11,6 @@ let cfgFile = format.generate "00-default.conf" cfg.settings; in { - imports = [ - (mkRenamedOptionModule [ "virtualisation" "cri-o" "registries" ] [ "virtualisation" "containers" "registries" "search" ]) - ]; - meta = { maintainers = teams.podman.members; }; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index ccf30a0ff66..90df074c647 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -46,7 +46,6 @@ in imports = [ ./dnsname.nix ./network-socket.nix - (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) ]; meta = { |