about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-05-10 16:32:00 +0200
committersternenseemann <sternenseemann@systemli.org>2023-05-10 16:32:00 +0200
commitbd8335552e8712e7c25dc0cc28e3ab3dfed4404e (patch)
tree72cad6cc52b15e64120b04313b5445d0e55d86d1 /maintainers
parentdd6a74bdbeaecc9bd8faf9a2fc2b78aa70c5af6b (diff)
parenta1386a8f2d3b8fbff53fe4c252ddf09223e0aa10 (diff)
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix12
-rw-r--r--maintainers/team-list.nix1
2 files changed, 13 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1639ab70c8fb0..214caa4306a48 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6222,6 +6222,12 @@
     githubId = 982322;
     name = "Henrik Olsson";
   };
+  henrirosten = {
+    email = "henri.rosten@unikie.com";
+    github = "henrirosten";
+    githubId = 49935860;
+    name = "Henri Rosten";
+  };
   henrytill = {
     email = "henrytill@gmail.com";
     github = "henrytill";
@@ -9041,6 +9047,12 @@
       fingerprint = "74F5 E5CC 19D3 B5CB 608F  6124 68FF 81E6 A785 0F49";
     }];
   };
+  lizelive = {
+    email = "nixpkgs@lize.live";
+    github = "lizelive";
+    githubId = 40217331;
+    name = "LizeLive";
+  };
   lluchs = {
     email = "lukas.werling@gmail.com";
     github = "lluchs";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9a6e32e8e2f8b..58c940af97b2f 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -151,6 +151,7 @@ with lib.maintainers; {
 
   cuda = {
     members = [
+      connorbaker
       SomeoneSerge
     ];
     scope = "Maintain CUDA-enabled packages";