diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-04-20 12:35:36 +0100 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2020-04-21 10:03:22 +0100 |
| commit | f0a92ef1d98a7f26e4918351fa865a17883de41b (patch) | |
| tree | 6e675f37f0a0ae94d11b200b517d6c9ac10c286d /nixos | |
| parent | b512a788a4c135c42a5af75ece88d67efaddd4d9 (diff) | |
| download | nixpkgs-f0a92ef1d98a7f26e4918351fa865a17883de41b.tar nixpkgs-f0a92ef1d98a7f26e4918351fa865a17883de41b.tar.gz nixpkgs-f0a92ef1d98a7f26e4918351fa865a17883de41b.tar.bz2 nixpkgs-f0a92ef1d98a7f26e4918351fa865a17883de41b.tar.lz nixpkgs-f0a92ef1d98a7f26e4918351fa865a17883de41b.tar.xz nixpkgs-f0a92ef1d98a7f26e4918351fa865a17883de41b.tar.zst nixpkgs-f0a92ef1d98a7f26e4918351fa865a17883de41b.zip | |
nixos/podman: Add maintainer team & add myself to podman team
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/podman.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/podman.nix | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index c1777eb95d9..aa4846837c4 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -37,6 +37,9 @@ let ''; in { + meta = { + maintainers = lib.teams.podman.members; + }; options.virtualisation.podman = { @@ -143,7 +146,6 @@ in pkgs.runc # Default container runtime pkgs.crun # Default container runtime (cgroups v2) pkgs.conmon # Container runtime monitor - pkgs.skopeo # Interact with container registry pkgs.slirp4netns # User-mode networking for unprivileged namespaces pkgs.fuse-overlayfs # CoW for images, much faster than default vfs pkgs.utillinux # nsenter @@ -180,7 +182,7 @@ in offset = acc.offset + 65536; } ) - { values = []; offset = 100000; } cfg.users + { values = []; offset = 100000; } (lib.unique cfg.users) ).values ); diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index 601a6791c2f..ccfe8334a16 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -1,10 +1,10 @@ # This test runs podman and checks if simple container starts import ./make-test-python.nix ( - { pkgs, ... }: { + { pkgs, lib, ... }: { name = "podman"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ adisbladis ]; + meta = { + maintainers = lib.teams.podman.members; }; nodes = { |