Merge staging-next into staging

2021-05-16 18:32:44 +00:00
parent 21541fc97c 8c6d819143
commit 6cdac75d25
77 changed files with 796 additions and 1799 deletions
@@ -24,7 +24,7 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
      };
    };

-    virtualisation.memorySize = 2048;
+    virtualisation.memorySize = 2047;
  };

  testScript = ''