public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85894 from zowoq/podman-crio 

podman team: add cri-o packages/module
This commit is contained in:
adisbladis 2020-04-24 11:34:07 +02:00 committed by GitHub
parent e5be8d2d06 d8e8169bb0
commit 5a3b818368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/team-list.nix
View File

@ -38,6 +38,6 @@ with lib.maintainers; {
vdemeester vdemeester
zowoq zowoq
]; ];
scope = "Maintain Podman related packages and modules."; scope = "Maintain Podman and CRI-O related packages and modules.";
}; };
} }

4
nixos/modules/virtualisation/cri-o.nix
View File

@ -6,6 +6,10 @@ let
cfg = config.virtualisation.cri-o; cfg = config.virtualisation.cri-o;
in in
{ {
meta = {
maintainers = lib.teams.podman.members;
};
options.virtualisation.cri-o = { options.virtualisation.cri-o = {
enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)"; enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)";

2
pkgs/applications/networking/cluster/cni/plugins.nix
View File

@ -37,6 +37,6 @@ buildGoPackage rec {
homepage = "https://github.com/containernetworking/plugins"; homepage = "https://github.com/containernetworking/plugins";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan saschagrunert ]; maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members;
}; };
} }

2
pkgs/applications/virtualization/cri-o/default.nix
View File

@ -57,7 +57,7 @@ in buildGoPackage rec {
description = ''Open Container Initiative-based implementation of the description = ''Open Container Initiative-based implementation of the
Kubernetes Container Runtime Interface''; Kubernetes Container Runtime Interface'';
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ saschagrunert ]; maintainers = with maintainers; [ ] ++ teams.podman.members;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/tools/virtualization/cri-tools/default.nix
View File

@ -21,6 +21,6 @@ buildGoPackage rec {
description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)";
homepage = "https://github.com/kubernetes-sigs/cri-tools"; homepage = "https://github.com/kubernetes-sigs/cri-tools";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ saschagrunert ]; maintainers = with maintainers; [ ] ++ teams.podman.members;
}; };
} }