Merge staging-next into staging

2021-01-27 12:24:09 +00:00
parent 8f69090ba5 2137c13b40
commit 1b5da764a7
93 changed files with 461 additions and 238 deletions
@@ -20,7 +20,6 @@
 }:

 let
-    inherit (stdenv) lib;
    buildClient = monolithic || client;
    buildCore = monolithic || enableDaemon;
 in