summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2022-02-01 21:37:39 -0500
committerDmitry Kalinkin <dmitry.kalinkin@gmail.com>2022-02-01 21:37:39 -0500
commit3087088c41d5725cb62b90247eb28b1fa2f70b4f (patch)
tree40170a864d919c0b0d4ce236eab455fe240618d5 /maintainers
parent184d6ba76bc9db589223ba522027533c6c55f015 (diff)
parentd05ca00ab5cbaa4413b93192bff054feb3695e4e (diff)
downloadnixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar
nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.gz
nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.bz2
nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.lz
nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.xz
nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.zst
nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.zip
Merge branch 'staging-next' into staging
 Conflicts:
	pkgs/top-level/aliases.nix
	pkgs/top-level/python-aliases.nix
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8a827855d7e..d0a90fa4cfe 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2303,6 +2303,13 @@
     githubId = 5561189;
     name = "Cody Opel";
   };
+  Cogitri = {
+    email = "oss@cogitri.dev";
+    github = "Cogitri";
+    githubId = 8766773;
+    matrix = "@cogitri:cogitri.dev";
+    name = "Rasmus Thomsen";
+  };
   cohei = {
     email = "a.d.xvii.kal.mai@gmail.com";
     github = "cohei";