Unverified Commit 4f3be6e3 authored by Michael Daniels's avatar Michael Daniels
Browse files

Merge branch 'staging-next' into staging

parents 446370ea 19e820ec

maintainers/maintainer-list.nix

+0 −26
Original line number Diff line number Diff line
@@ -6997,13 +6997,6 @@ 
    githubId = 974130;

    name = "David Pätzel";

  };

  dpausp = {

    email = "dpausp@posteo.de";

    github = "dpausp";

    githubId = 1965950;

    name = "Tobias Stenzel";

    keys = [ { fingerprint = "4749 0887 CF3B 85A1 6355  C671 78C7 DD40 DF23 FB16"; } ];

  };

  dpc = {

    email = "dpc@dpc.pw";

    github = "dpc";
@@ -9409,13 +9402,6 @@ 
    githubId = 34658064;

    name = "Grace Dinh";

  };

  genericnerdyusername = {

    name = "GenericNerdyUsername";

    email = "genericnerdyusername@proton.me";

    github = "GenericNerdyUsername";

    githubId = 111183546;

    keys = [ { fingerprint = "58CE D4BE 6B10 149E DA80  A990 2F48 6356 A4CB 30F3"; } ];

  };

  genga898 = {

    email = "genga898@gmail.com";

    github = "genga898";
@@ -9847,12 +9833,6 @@ 
    githubId = 10908649;

    name = "Graham Bennett";

  };

  grahamc = {

    email = "graham@grahamc.com";

    github = "grahamc";

    githubId = 76716;

    name = "Graham Christensen";

  };

  grahamnorris = {

    email = "oss@grahamjnorris.com";

    github = "grahamnorris";
@@ -22699,12 +22679,6 @@ 
    githubId = 53882428;

    name = "Erik Rodriguez";

  };

  roelvandijk = {

    email = "roel@lambdacube.nl";

    github = "roelvandijk";

    githubId = 710906;

    name = "Roel van Dijk";

  };

  rogarb = {

    email = "rogarb@rgarbage.fr";

    github = "rogarb";

maintainers/team-list.nix

+0 −39
Original line number Diff line number Diff line
@@ -141,12 +141,6 @@ with lib.maintainers; 
    enableFeatureFreezePing = true;

  };



  clevercloud = {

    members = [ floriansanderscc ];

    scope = "Maintain Clever Cloud related packages.";

    shortName = "CleverCloud";

  };



  cloudposse = {

    members = [ dudymas ];

    scope = "Maintain atmos and applications made by the Cloud Posse team.";
@@ -235,16 +229,6 @@ with lib.maintainers; 
    shortName = "D. E. Shaw employees";

  };



  determinatesystems = {

    # Verify additions to this team with at least one already existing member of the team.

    members = [

      cole-h

      grahamc

    ];

    scope = "Group registration for packages maintained by Determinate Systems.";

    shortName = "Determinate Systems employees";

  };



  dhall = {

    members = [

      Gabriella439
@@ -318,19 +302,6 @@ with lib.maintainers; 
    github = "flutter";

  };



  flyingcircus = {

    # Verify additions by approval of an already existing member of the team.

    members = [

      theuni

      dpausp

      frlan

      leona

      osnyx

    ];

    scope = "Team for Flying Circus employees who collectively maintain packages.";

    shortName = "Flying Circus employees";

  };



  forgejo = {

    members = [

      adamcstephens
@@ -560,16 +531,6 @@ with lib.maintainers; 
    enableFeatureFreezePing = true;

  };



  lumiguide = {

    # Verify additions by approval of an already existing member of the team.

    members = [

      roelvandijk

      lucus16

    ];

    scope = "Group registration for LumiGuide employees who collectively maintain packages.";

    shortName = "Lumiguide employees";

  };



  lumina = {

    github = "lumina";

    enableFeatureFreezePing = true;

nixos/modules/hardware/mcelog.nix

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
  ...

}:

{

  meta.maintainers = with lib.maintainers; [ grahamc ];

  options = {



    hardware.mcelog = {

nixos/modules/hardware/openrazer.nix

+0 −4
Original line number Diff line number Diff line
@@ -177,8 +177,4 @@ in 
      };

    };

  };



  meta = {

    maintainers = with lib.maintainers; [ roelvandijk ];

  };

}

nixos/modules/services/mail/mailpit.nix

+4 −1
Original line number Diff line number Diff line
@@ -102,5 +102,8 @@ in 
    ) instances;

  };



  meta.maintainers = lib.teams.flyingcircus.members;

  meta.maintainers = [

    lib.maintainers.leona

    lib.maintainers.osnyx

  ];

}