Unverified Commit d64f70b1 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents a1e3ec71 2296a312

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -22866,6 +22866,13 @@ 
    githubId = 96694484;

    name = "Sandeep Patel";

  };

  sandydoo = {

    name = "Sander";

    github = "sandydoo";

    githubId = 7572407;

    email = "hey@sandydoo.me";

    matrix = "@sandydoo:matrix.org";

  };

  Sanskarzz = {

    email = "sanskar.gur@gmail.com";

    github = "Sanskarzz";

maintainers/team-list.nix

+10 −0
Original line number Diff line number Diff line
@@ -170,6 +170,16 @@ with lib.maintainers; 
    shortName = "c3d2";

  };



  cachix = {

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

    members = [

      domenkozar

      sandydoo

    ];

    scope = "Group registration for packages maintained by Cachix.";

    shortName = "Cachix employees";

  };



  categorization = {

    members = [

      aleksana

nixos/modules/services/system/cachix-agent/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ let 
  cfg = config.services.cachix-agent;

in

{

  meta.maintainers = [ lib.maintainers.domenkozar ];

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



  options.services.cachix-agent = {

    enable = lib.mkEnableOption "Cachix Deploy Agent: <https://docs.cachix.org/deploy/>";

nixos/modules/services/system/cachix-watch-store.nix

+3 −4
Original line number Diff line number Diff line
@@ -8,10 +8,9 @@ let 
  cfg = config.services.cachix-watch-store;

in

{

  meta.maintainers = [

    lib.maintainers.jfroche

    lib.maintainers.domenkozar

  ];

  meta = {

    maintainers = lib.teams.cachix.members ++ [ lib.maintainers.jfroche ];

  };



  options.services.cachix-watch-store = {

    enable = lib.mkEnableOption "Cachix Watch Store: <https://docs.cachix.org>";

pkgs/README.md

+2 −2
Original line number Diff line number Diff line
@@ -205,8 +205,8 @@ Other than that, PR titles have meaning only for humans. 
It is recommended to keep the PR title in sync with the commit title, to make it easier to find.

For PRs with multiple commits, the PR title should be a general summary of these commits.



[!NOTE]

Marking a PR as a draft does not prevent automatic builds.

> [!NOTE]

> Marking a PR as a draft does not prevent automatic builds.



## Category Hierarchy

[categories]: #category-hierarchy