Merge branch 'derivation-header-include-order' of github.com:Ericson2314/nix into validPathInfo-ca-proper-datatype

2020-06-01 17:13:11 -04:00
parent f4b89e11a4 bcde5456cc
commit 0cb67ecbd3
5 changed files with 6 additions and 7 deletions
@@ -1,7 +1,7 @@
 #include "get-drvs.hh"
 #include "util.hh"
 #include "eval-inline.hh"
-#include "derivations.hh"
+#include "store-api.hh"

 #include <cstring>
 #include <regex>
@@ -1,6 +1,6 @@
 #include "primops.hh"
 #include "eval-inline.hh"
-#include "derivations.hh"
+#include "store-api.hh"

 namespace nix {