Merge pull request NixOS#297266 from ByteSudoer/init-vidmerger

vidmerger: init at 0.3.2
ethnh · Mar 25, 2024 · c2328cf · c2328cf
2 parents 383125f + 89ea04d
commit c2328cf
Show file tree

Hide file tree

Showing 4 changed files with 802 additions and 0 deletions.
diff --git a/lib/licenses.nix b/lib/licenses.nix
@@ -392,6 +392,12 @@ in mkLicense lset) ({
     fullName = "Common Public Attribution License 1.0";
   };
 
+  commons-clause = {
+    fullName = "Commons Clause License";
+    url = "https://commonsclause.com/";
+    free = false;
+  };
+
   cpl10 = {
     spdxId = "CPL-1.0";
     fullName = "Common Public License 1.0";

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -2958,6 +2958,12 @@
     github = "bycEEE";
     githubId = 8891115;
     name = "Brian Choy";
+  };
+   ByteSudoer = {
+    email = "[email protected]";
+    github = "bytesudoer";
+    githubId = 88513682;
+    name = "ByteSudoer";
   };
   bzizou = {
     email = "[email protected]";