From 56b4159e234d92f6aedfc201de3a7b6df1be30d1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 23 Mar 2024 19:52:29 -0300 Subject: [PATCH 1/2] nixos/tests/k3s: sync meta.maintainers to k3s package --- nixos/tests/k3s/multi-node.nix | 4 +--- nixos/tests/k3s/single-node.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 932b4639b39c..20279f3ca4b9 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -128,9 +128,7 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: }; }; - meta = with pkgs.lib.maintainers; { - maintainers = [ euank ]; - }; + meta.maintainers = k3s.meta.maintainers; testScript = '' machines = [server, server2, agent] diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index e059603b9c9d..fd64a050e61e 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -25,9 +25,7 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: in { name = "${k3s.name}-single-node"; - meta = with pkgs.lib.maintainers; { - maintainers = [ euank ]; - }; + meta.maintainers = k3s.meta.maintainers; nodes.machine = { pkgs, ... }: { environment.systemPackages = with pkgs; [ k3s gzip ]; From 82dfd3cdd95855a16fb0522f23543e636cc52fee Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 23 Mar 2024 19:52:51 -0300 Subject: [PATCH 2/2] k3s: add superherointj as maintainer --- pkgs/applications/networking/cluster/k3s/builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 01659d9236c8..b5f017b85b05 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -83,7 +83,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 yajo ]; + maintainers = with maintainers; [ euank mic92 superherointj yajo ]; platforms = platforms.linux; # resolves collisions with other installations of kubectl, crictl, ctr