Merge master into staging-next

2021-04-19 18:11:51 +00:00
parent 965c8e08a5 b26886474a
commit 6ef7c23763
54 changed files with 512 additions and 279 deletions
@@ -41,8 +41,8 @@ in {

      package = mkOption {
        type = types.package;
-        default = pkgs.mxisd;
-        defaultText = "pkgs.mxisd";
+        default = pkgs.ma1sd;
+        defaultText = "pkgs.ma1sd";
        description = "The mxisd/ma1sd package to use";
      };