Merge remote-tracking branch 'origin/master' into flakes

2020-06-26 08:46:46 +02:00
parent 09fc06daab b7ccf7ae2a
commit adf2fbbdc2
66 changed files with 751 additions and 359 deletions
@@ -1,6 +1,6 @@
 #include "primops.hh"
 #include "eval-inline.hh"
-#include "derivations.hh"
+#include "store-api.hh"

 namespace nix {