Cleanup helsinki maintainer (#353611)

* maintainers: update email conni2461 * maintainers: add helsinki-jo * tree-wide: cleanup maintainership of helsinki-systems
2024-11-21 14:32:59 +00:00 · 2024-11-04 12:59:26 +01:00 · 2024-11-04 12:59:26 +01:00 · c4edf93988
commit c4edf93988
parent b0d81cb9c6
21 changed files with 28 additions and 22 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4394,7 +4394,7 @@
    githubId = 2083950;
  };
  conni2461 = {
-    email = "simon.hauser@outlook.com";
+    email = "simon-hauser@outlook.com";
    github = "Conni2461";
    name = "Simon Hauser";
    githubId = 15233006;
@ -8674,6 +8674,12 @@
    githubId = 186660;
    name = "Miao, ZhiCheng";
  };
+  helsinki-Jo = {
+    email = "joachim.ernst@helsinki-systems.de";
+    github = "helsinki-Jo";
+    githubId = 155722885;
+    name = "Joachim Ernst";
+  };
  henkery = {
    email = "jim@reupload.nl";
    github = "henkery";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -465,6 +465,7 @@ with lib.maintainers;
    members = [
      das_j
      conni2461
+      helsinki-Jo
    ];
    scope = "Group registration for packages maintained by Helsinki Systems";
    shortName = "Helsinki Systems employees";
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@ -9,7 +9,7 @@
    };
  };
 in {
-  meta.maintainers = with maintainers; [ das_j ];
+  meta.maintainers = teams.helsinki-systems.members;

  options.services.icingaweb2 = with types; {
    enable = mkEnableOption "the icingaweb2 web interface";
--- a/nixos/tests/icingaweb2.nix
+++ b/nixos/tests/icingaweb2.nix
@ -1,7 +1,7 @@
 import ./make-test-python.nix ({ pkgs, ... }: {
  name = "icingaweb2";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ das_j ];
+  meta = {
+    maintainers = pkgs.lib.teams.helsinki-systems.members;
  };

  nodes = {
--- a/nixos/tests/lvm2/vdo.nix
+++ b/nixos/tests/lvm2/vdo.nix
@ -1,7 +1,7 @@
 { kernelPackages ? null, mkXfsFlags ? "" }:
 import ../make-test-python.nix ({ pkgs, lib, ... }: {
  name = "lvm2-vdo";
-  meta.maintainers = lib.teams.helsinki-systems.members;
+  meta.maintainers = [ ];

  nodes.machine = { pkgs, lib, ... }: {
    # Minimum required size for VDO volume: 5063921664 bytes
--- a/nixos/tests/varnish.nix
+++ b/nixos/tests/varnish.nix
@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let
 in {
  name = "varnish";
  meta = {
-    maintainers = lib.teams.helsinki-systems.members;
+    maintainers = [ ];
  };

  nodes = {
--- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
@ -21,6 +21,6 @@ buildGoModule rec {
    homepage = "https://gitlab.com/gitlab-org/gitlab-pages";
    changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
-    maintainers = teams.helsinki-systems.members ++ teams.gitlab.members;
+    maintainers = teams.gitlab.members;
  };
 }
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "Validating, recursive, and caching DNS resolver";
    license = licenses.bsd3;
    homepage = "https://www.unbound.net";
-    maintainers = lib.teams.helsinki-systems.members;
+    maintainers = [ ];
    platforms = platforms.unix ++ platforms.windows;
  };
 })
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
    homepage = "https://netfilter.org/projects/libnftnl/";
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ fpletz ] ++ teams.helsinki-systems.members;
+    maintainers = with maintainers; [ fpletz ];
  };
 }
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@ -69,8 +69,7 @@ stdenv.mkDerivation rec {
    homepage = "https://jenkins.io/";
    sourceProvenance = with sourceTypes; [ binaryBytecode ];
    license = licenses.mit;
-    maintainers = with maintainers;
-      [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members;
+    maintainers = with maintainers; [ coconnor earldouglas nequissimus ];
    changelog = "https://www.jenkins.io/changelog-stable/#v${version}";
    mainProgram = "jenkins-cli";
    platforms = platforms.all;
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@ -29,7 +29,7 @@ let
    homepage = "https://apparmor.net/";
    description = "Mandatory access control system - ${component}";
    license = with licenses; [ gpl2Only lgpl21Only ];
-    maintainers = with maintainers; [ julm thoughtpolice ] ++ teams.helsinki-systems.members;
+    maintainers = with maintainers; [ julm thoughtpolice ];
    platforms = platforms.linux;
  };

--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@ -153,6 +153,6 @@ stdenv.mkDerivation rec {
    description = "Tools to support Logical Volume Management (LVM) on Linux";
    platforms = platforms.linux;
    license = with licenses; [ gpl2Only bsd2 lgpl21 ];
-    maintainers = with maintainers; [ raskin ajs124 ] ++ teams.helsinki-systems.members;
+    maintainers = with maintainers; [ raskin ajs124 ];
  };
 }
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
    homepage = "https://netfilter.org/projects/nftables/";
    license = licenses.gpl2Only;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members;
+    maintainers = with maintainers; [ izorkin ];
    mainProgram = "nft";
  };
 }
--- a/pkgs/os-specific/linux/targetcli/default.nix
+++ b/pkgs/os-specific/linux/targetcli/default.nix
@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
    description = "Command shell for managing the Linux LIO kernel target";
    homepage = "https://github.com/open-iscsi/targetcli-fb";
    license = licenses.asl20;
-    maintainers = lib.teams.helsinki-systems.members;
+    maintainers = [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/os-specific/linux/vdo/default.nix
+++ b/pkgs/os-specific/linux/vdo/default.nix
@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
    # platforms are defined in https://github.com/dm-vdo/vdo/blob/master/utils/uds/atomicDefs.h
    platforms = [ "x86_64-linux" "aarch64-linux" "s390-linux" "powerpc64-linux" "powerpc64le-linux" ];
    license = with licenses; [ gpl2Plus ];
-    maintainers = teams.helsinki-systems.members;
+    maintainers = [ ];
  };
 }
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec {
    '';
    homepage = "https://www.icinga.com/products/icinga-web-2/";
    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ das_j ];
+    maintainers = teams.helsinki-systems.members;
    mainProgram = "icingacli";
    platforms = platforms.all;
  };
--- a/pkgs/servers/icingaweb2/ipl.nix
+++ b/pkgs/servers/icingaweb2/ipl.nix
@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
    homepage = "https://github.com/Icinga/icinga-php-library";
    license = lib.licenses.mit;
    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ das_j ];
+    maintainers = lib.teams.helsinki-systems.members;
  };
 }
--- a/pkgs/servers/icingaweb2/thirdparty.nix
+++ b/pkgs/servers/icingaweb2/thirdparty.nix
@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
    homepage = "https://github.com/Icinga/icinga-php-thirdparty";
    license = lib.licenses.mit;
    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ das_j ];
+    maintainers = lib.teams.helsinki-systems.members;
  };
 }
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@ -65,6 +65,6 @@ buildGoModule rec {
    license = with licenses; [ agpl3Only asl20 ];
    homepage = "https://grafana.com/oss/loki/";
    changelog = "https://github.com/grafana/loki/releases/tag/v${version}";
-    maintainers = with maintainers; [ willibutz globin mmahut emilylange ] ++ teams.helsinki-systems.members;
+    maintainers = with maintainers; [ willibutz globin mmahut emilylange ];
  };
 }
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@ -45,7 +45,7 @@ let
        description = "Web application accelerator also known as a caching HTTP reverse proxy";
        homepage = "https://www.varnish-cache.org";
        license = licenses.bsd2;
-        maintainers = teams.helsinki-systems.members;
+        maintainers = [ ];
        platforms = platforms.unix;
      };
    };
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
    description = "SGI XFS utilities";
    license = with licenses; [ gpl2Only lgpl21 gpl3Plus ];  # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright
    platforms = platforms.linux;
-    maintainers = with maintainers; [ dezgeg ajs124 ] ++ teams.helsinki-systems.members;
+    maintainers = with maintainers; [ dezgeg ajs124 ];
  };
 }