Merge branch master into staging to fix eval error

This fixes the eval error of the small (and "big"?) NixOS test set that was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
parent 5d03fe6ac4 c127653b72
commit db0fe5c3eb
459 changed files with 6060 additions and 2715 deletions
@@ -15,7 +15,7 @@ let # in mariadb # spans the whole file

 libExt = stdenv.hostPlatform.extensions.sharedLibrary;

-mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]);
+mytopEnv = perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);

 mariadb = server // {
  inherit client; # MariaDB Client