Merge master into staging-next

2021-04-08 18:14:17 +00:00
parent bf6abedefb c6bd90d48f
commit 85b57e4446
96 changed files with 5973 additions and 343 deletions
@@ -38,7 +38,7 @@ buildRubyGem rec {
    '';
    homepage = "https://github.com/manveru/bundix";
    license = "MIT";
-    maintainers = with lib.maintainers; [ manveru zimbatm ];
+    maintainers = with lib.maintainers; [ manveru marsam zimbatm ];
    platforms = lib.platforms.all;
  };
 }