Merge branch 'master' into mesa-updates

Change-Id: I4b468bb3148d392c9ade30dfe0cfb68c574a8e27

1 files changed, 13 insertions, 0 deletions

diff --git a/etc/teams.scm b/etc/teams.scm
index 2f920a5876..d86647e7ea 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -529,6 +529,15 @@ GLib/GIO, GTK, GStreamer and Webkit."
         #:description "Audio related packages."
         #:scope (list "gnu/packages/audio.scm")))
 
+(define-team zig
+  (team 'zig
+        #:name "Zig team"
+        #:description "Zig, Zig packages, and the zig-build system"
+        #:scope (list "gnu/packages/zig.scm"
+                      "gnu/packages/zig-xyz.scm"
+                      "guix/build/zig-build-system.scm"
+                      "guix/build-system/zig.scm")))
+
 
 (define-member (person "Eric Bavier"
                        "bavier@posteo.net")
@@ -662,6 +671,10 @@ GLib/GIO, GTK, GStreamer and Webkit."
                        "gabriel@erlikon.ch")
   audio)
 
+(define-member (person "Ekaitz Zarraga"
+                       "ekaitz@elenq.tech")
+  bootstrap zig)
+
 
 (define (find-team name)
   (or (hash-ref %teams (string->symbol name))