Merge branch 'master' into staging-next

- Thunderbird 68 has been dropped on master. - gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.
2021-05-16 15:34:51 +02:00
parent e4d9759314 c58b97674b
commit 684991c696
36 changed files with 600 additions and 1660 deletions
@@ -24,7 +24,7 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
      };
    };

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

  testScript = ''