From d2556f0a95cdd2a981e80e1d94f9ba9e6a3dccb9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:10:47 +1000 Subject: [PATCH 1/9] maintainers/teams: add podman team --- maintainers/team-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1d8b291978b..7efff7f45ec 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -30,4 +30,13 @@ with lib.maintainers; { ]; scope = "Maintain GNOME desktop environment and platform."; }; + + podman = { + members = [ + saschagrunert + vdemeester + zowoq + ]; + scope = "Maintain podman related packages."; + }; } From 6f052a9a12e823ef6664508aea7353e9fca2ef07 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:11:24 +1000 Subject: [PATCH 2/9] conmon: update maintainers --- pkgs/applications/virtualization/conmon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 449d06430a5..59548693700 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; }; } From f85106b3d24ecd6f71e487d3d5c69b37d1558c68 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:11:24 +1000 Subject: [PATCH 3/9] crun: update maintainers --- pkgs/applications/virtualization/crun/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 35b88d7e447..ded793449fc 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; inherit (src.meta) homepage; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } From edd336f4bba203d4e25ea3d70163405834bc46c8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:11:25 +1000 Subject: [PATCH 4/9] podman: update maintainers --- pkgs/applications/virtualization/podman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 288cac27b21..cd78c12bdc5 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -41,7 +41,7 @@ buildGoPackage rec { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester saschagrunert marsam ]; + maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; }; } From 163d90530578639287eda04b07bd1173eed3ba70 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:11:26 +1000 Subject: [PATCH 5/9] runc: update maintainers --- pkgs/applications/virtualization/runc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index e7713d45f2f..363a41c1edf 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -53,7 +53,7 @@ buildGoPackage rec { homepage = https://runc.io/; description = "A CLI tool for spawning and running containers according to the OCI specification"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester saschagrunert ]; + maintainers = with maintainers; [ offline ] ++ teams.podman.members; platforms = platforms.linux; }; } From 2af7c9cfae3c540e157bbe2c80972b909b323590 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:11:26 +1000 Subject: [PATCH 6/9] buildah: update maintainers --- pkgs/development/tools/buildah/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 6f207ee4f5f..4d2bbb12ace 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -39,6 +39,6 @@ buildGoPackage rec { homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ]; + maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; }; } From 878589a1225d27997c98d186d7184e073ea4444f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:11:27 +1000 Subject: [PATCH 7/9] skopeo: update maintainers --- pkgs/development/tools/skopeo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index c065629018c..4b55649b612 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -49,10 +49,10 @@ buildGoPackage { popd ''; - meta = { + meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; - maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ]; - license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ lewo ] ++ teams.podman.members; + license = licenses.asl20; }; } From ab00d36d27b69e2b7ffb0c75505c38a3a037428f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:11:28 +1000 Subject: [PATCH 8/9] fuse-overlayfs: update maintainers --- pkgs/tools/filesystems/fuse-overlayfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 00f89313942..02347944788 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; - maintainers = with maintainers; [ ma9e ]; + maintainers = with maintainers; [ ma9e ] ++ teams.podman.members; platforms = platforms.unix; inherit (src.meta) homepage; }; From 4bbd415ddfb245a43415c14197028cadf610fe16 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Apr 2020 20:11:28 +1000 Subject: [PATCH 9/9] slirp4netns: update maintainers --- pkgs/tools/networking/slirp4netns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 01e4bdcaa8b..f3bd0a23d58 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej saschagrunert ]; + maintainers = with maintainers; [ orivej ] ++ teams.podman.members; platforms = platforms.linux; }; }