about summary refs log tree commit diff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2023-08-13 21:28:26 -0400
committerGitHub <noreply@github.com>2023-08-13 21:28:26 -0400
commit81b970640e56a5c07a336d2c05018b0c9bf57a51 (patch)
tree6020a7bc96bb72814bf0eb589cecc0e7c6ea77fc
parenta262231ccac4edfe56e64a16ff401fc0be9ca22b (diff)
parentd4884873364b23f67a97cc69c75adb210674040b (diff)
Merge pull request #248252 from figsoda/zig-team
-rw-r--r--.github/CODEOWNERS4
-rw-r--r--maintainers/team-list.nix10
-rw-r--r--pkgs/development/compilers/zig/generic.nix2
3 files changed, 15 insertions, 1 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 45bc58a9def75..f96d058c374b9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -305,5 +305,9 @@ nixos/lib/make-multi-disk-zfs-image.nix   @raitobezarius
 nixos/modules/tasks/filesystems/zfs.nix   @raitobezarius
 nixos/tests/zfs.nix                       @raitobezarius
 
+# Zig
+/pkgs/development/compilers/zig @AndersonTorres @figsoda
+/doc/hooks/zig.section.md @AndersonTorres @figsoda
+
 # Linux Kernel
 pkgs/os-specific/linux/kernel/manual-config.nix   @amjoseph-nixpkgs
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 5e3a01412ee8a..7d6df479d6edd 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -892,4 +892,14 @@ with lib.maintainers; {
     shortName = "Xfce";
     enableFeatureFreezePing = true;
   };
+
+  zig = {
+    members = [
+      AndersonTorres
+      figsoda
+    ];
+    scope = "Maintain the Zig compiler toolchain and nixpkgs integration.";
+    shortName = "Zig";
+    enableFeatureFreezePing = true;
+  };
 }
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 4651e9e68e544..a0dbea04869ef 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://ziglang.org/";
     changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres figsoda ];
+    maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
     platforms = lib.platforms.unix;
   };
 } // removeAttrs args [ "hash" ])