From f0ec10a8299d825639f939efd632418e6e3f418f Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Mon, 18 Jan 2021 21:23:49 +0100 Subject: [PATCH] treewide: remove kampka as maintainer (#109813) --- maintainers/maintainer-list.nix | 10 ---------- nixos/modules/services/web-apps/trilium.nix | 2 +- nixos/tests/containers-tmpfs.nix | 2 +- nixos/tests/zsh-history.nix | 2 +- pkgs/applications/networking/cluster/kops/default.nix | 2 +- .../networking/cluster/spacegun/default.nix | 2 +- pkgs/applications/office/trilium/default.nix | 2 +- .../matrix-synapse/matrix-appservice-slack/default.nix | 2 +- pkgs/shells/zsh/zsh-history/default.nix | 2 +- pkgs/tools/networking/gandi-cli/default.nix | 2 +- 10 files changed, 9 insertions(+), 19 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 830144ac2b3..a7be95bc58b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1699,16 +1699,6 @@ githubId = 46303707; name = "Christian Lütke-Stetzkamp"; }; - kampka = { - email = "christian@kampka.net"; - github = "kampka"; - githubId = 422412; - name = "Christian Kampka"; - keys = [{ - longkeyid = "ed25519/0x1CBE9645DD68E915"; - fingerprint = "F7FA 0BD0 8775 337C F6AB 4A14 1CBE 9645 DD68 E915"; - }]; - }; ckauhaus = { email = "kc@flyingcircus.io"; github = "ckauhaus"; diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 3fa8dad0490..3a6ea02676a 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -85,7 +85,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { - meta.maintainers = with lib.maintainers; [ kampka ]; + meta.maintainers = with lib.maintainers; [ ]; users.groups.trilium = {}; users.users.trilium = { diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index e1ab098e985..7ebf0d02a24 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-tmpfs"; meta = with pkgs.lib.maintainers; { - maintainers = [ kampka ]; + maintainers = [ ]; }; machine = diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix index caed45e851d..3109c3f6508 100644 --- a/nixos/tests/zsh-history.nix +++ b/nixos/tests/zsh-history.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "zsh-history"; meta = with pkgs.lib.maintainers; { - maintainers = [ kampka ]; + maintainers = [ ]; }; nodes.default = { ... }: { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index f3037cf8a36..98ffcd6fe67 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -44,7 +44,7 @@ let homepage = "https://github.com/kubernetes/kops"; changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; license = licenses.asl20; - maintainers = with maintainers; [ offline zimbatm kampka ]; + maintainers = with maintainers; [ offline zimbatm ]; platforms = platforms.unix; }; } // attrs'; diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix index 2180d8d3048..64623f88dda 100644 --- a/pkgs/applications/networking/cluster/spacegun/default.nix +++ b/pkgs/applications/networking/cluster/spacegun/default.nix @@ -21,7 +21,7 @@ nodePackages."${packageName}".override { meta = with lib; { description = "Version controlled multi-cluster deployment manager for kubernetes"; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index bd067688fb4..499aa1e5faf 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -16,7 +16,7 @@ let homepage = "https://github.com/zadam/trilium"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; + maintainers = with maintainers; [ emmanuelrosa dtzWill ]; }; version = "0.43.3"; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index f4b89981d69..389b724a134 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -19,7 +19,7 @@ nodePackages."${packageName}".override { meta = with lib; { description = "A Matrix <--> Slack bridge"; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 3d48467a246..333da40adbb 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/b4b4r07/history"; platforms = platforms.unix; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; }; passthru.tests = { diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index e66d5b7c2a5..724e367d35d 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -21,6 +21,6 @@ buildPythonApplication rec { description = "Command-line interface to the public Gandi.net API"; homepage = "https://cli.gandi.net/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; }; }