diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6595b4c5aa69..559415a7a115 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -539,18 +539,6 @@ with lib.maintainers; shortName = "Matrix"; }; - mercury = { - members = [ - _9999years - Gabriella439 - curran - lf- - jkachmar - ]; - scope = "Group registry for packages maintained by Mercury"; - shortName = "Mercury Employees"; - }; - minimal-bootstrap = { members = [ alejandrosame diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix index 596b7fbc8c4a..b6c806815f0c 100644 --- a/pkgs/by-name/ho/honeycomb-refinery/package.nix +++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix @@ -52,6 +52,9 @@ buildGoModule (finalAttrs: { description = "Tail-sampling proxy for OpenTelemetry"; mainProgram = "refinery"; license = lib.licenses.asl20; - teams = [ lib.teams.mercury ]; + maintainers = with lib.maintainers; [ + jkachmar + lf- + ]; }; }) diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix index 53a0c852041d..90778dec86de 100644 --- a/pkgs/by-name/py/pyroscope/package.nix +++ b/pkgs/by-name/py/pyroscope/package.nix @@ -55,7 +55,10 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/grafana/pyroscope"; changelog = "https://github.com/grafana/pyroscope/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.mercury ]; + maintainers = with lib.maintainers; [ + jkachmar + lf- + ]; mainProgram = "pyroscope"; }; }) diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix index d8ddc11d38ea..3a7158460014 100644 --- a/pkgs/by-name/tc/tcld/package.nix +++ b/pkgs/by-name/tc/tcld/package.nix @@ -69,7 +69,9 @@ buildGoModule (finalAttrs: { homepage = "https://www.github.com/temporalio/tcld"; changelog = "https://github.com/temporalio/tcld/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - teams = [ lib.teams.mercury ]; + maintainers = with lib.maintainers; [ + jkachmar + ]; mainProgram = "tcld"; }; }) diff --git a/pkgs/test/haskell/incremental/default.nix b/pkgs/test/haskell/incremental/default.nix index c9ade36deb2a..329346d9ce83 100644 --- a/pkgs/test/haskell/incremental/default.nix +++ b/pkgs/test/haskell/incremental/default.nix @@ -33,7 +33,11 @@ let }) temporary; in temporary-incremental-build.overrideAttrs (old: { - meta = { - teams = [ lib.teams.mercury ]; + meta = old.meta // { + maintainers = old.meta.maintainers or [ ] ++ [ + lib.maintainers._9999years + lib.maintainers.Gabriella439 + lib.maintainers.lf- + ]; }; })