Unverified Commit dfc80194 authored by Trim Bresilla's avatar Trim Bresilla Committed by GitHub
Browse files

Merge branch 'master' into rerun-add-cpp-sdk

parents fdfc06db cc41150c

ci/OWNERS

+5 −5
Original line number Diff line number Diff line
@@ -215,10 +215,10 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza 
/pkgs/development/r-modules         @jbedo



# Rust

/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt @figsoda

/pkgs/build-support/rust @zowoq @winterqt @figsoda

/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt

/pkgs/build-support/rust @zowoq @winterqt

/pkgs/build-support/rust/fetch-cargo-vendor* @TomaSajt

/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda

/doc/languages-frameworks/rust.section.md @zowoq @winterqt



# Tcl

/pkgs/development/interpreters/tcl  @fgaz
@@ -447,8 +447,8 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange 
/pkgs/os-specific/linux/zfs              @adamcstephens @amarshall



# Zig

/pkgs/development/compilers/zig @figsoda @RossComputerGuy

/doc/hooks/zig.section.md       @figsoda @RossComputerGuy

/pkgs/development/compilers/zig @RossComputerGuy

/doc/hooks/zig.section.md       @RossComputerGuy



# Buildbot

nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq

maintainers/README.md

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Commit access to the Nixpkgs repository is not required for that. 
In order to do so, add yourself to the [`maintainer-list.nix`](./maintainer-list.nix), and then to the desired package's `meta.maintainers` list, and send a PR with the changes.



If you're adding yourself as a maintainer as part of another PR (in which you become a maintainer of a package, for example), make your change to

`maintainer-list.nix` in a separate commit titled `maintainers: add <name>`.

`maintainer-list.nix` in a separate commit titled `maintainers: add <handle>`.



### Losing maintainer status

maintainers/github-teams.json

+1 −3
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ 
      "a-kenji": 65275785,

      "ahoneybun": 4884946,

      "drakon64": 6444703,

      "griffi-gh": 45996170,

      "michaelBelsanti": 62124625,

      "thefossguy": 44400303

    },
@@ -668,7 +667,7 @@ 
    "name": "neovim"

  },

  "nix-formatting": {

    "description": "Team to maintain the official Nix formatter and apply it to Nixpkgs",

    "description": "Maintain the official Nix formatter and apply it to Nixpkgs: https://nixos.org/community/teams/formatting/",

    "id": 9676823,

    "maintainers": {

      "infinisil": 20525370,
@@ -876,7 +875,6 @@ 
    "id": 7304571,

    "maintainers": {

      "Mic92": 96200,

      "figsoda": 40620903,

      "winterqt": 78392041,

      "zowoq": 59103226

    },

maintainers/maintainer-list.nix

+7 −14
Original line number Diff line number Diff line
@@ -2633,13 +2633,6 @@ 
    github = "aware70";

    githubId = 7832566;

  };

  awwpotato = {

    email = "awwpotato@voidq.com";

    matrix = "@awwpotato:envs.net";

    github = "awwpotato";

    githubId = 153149335;

    name = "awwpotato";

  };

  axertheaxe = {

    email = "axertheaxe@proton.me";

    github = "AxerTheAxe";
@@ -5561,6 +5554,13 @@ 
    githubId = 102048662;

    name = "Dalton Luce";

  };

  da157 = {

    email = "da157@voidq.com";

    matrix = "@awwpotato:envs.net";

    github = "0xda157";

    githubId = 153149335;

    name = "0xda157";

  };

  dabao1955 = {

    email = "dabao1955@163.com";

    github = "dabao1955";
@@ -8476,13 +8476,6 @@ 
    githubId = 52276064;

    name = "figboy9";

  };

  figsoda = {

    email = "figsoda@pm.me";

    matrix = "@figsoda:matrix.org";

    github = "figsoda";

    githubId = 40620903;

    name = "figsoda";

  };

  fionera = {

    email = "nix@fionera.de";

    github = "fionera";

maintainers/scripts/luarocks-packages.csv

+1 −1
Original line number Diff line number Diff line
@@ -159,5 +159,5 @@ tree-sitter-http,,,,0.0.33-1,, 
tree-sitter-norg,,,,,5.1,mrcjkb

tree-sitter-orgmode,,,,,,

vstruct,,,,,,

vusted,,,,,,figsoda

vusted,,,,,,

xml2lua,,,,,,teto