Move flake-related stuff to src/libexpr/flake

src/libexpr/eval.cc

@@ -7,7 +7,7 @@
 #include "eval-inline.hh"
 #include "download.hh"
 #include "json.hh"
-#include "primops/flake.hh"
+#include "flake/flake.hh"
 
 #include <algorithm>
 #include <cstring>

src/libexpr/flake/flake.cc

@@ -2,7 +2,7 @@
 #include "lockfile.hh"
 #include "primops.hh"
 #include "eval-inline.hh"
-#include "fetchGit.hh"
+#include "primops/fetchGit.hh"
 #include "download.hh"
 #include "args.hh"
 

src/libexpr/local.mk

@@ -4,7 +4,12 @@ libexpr_NAME = libnixexpr
 
 libexpr_DIR := $(d)
 
-libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc
+libexpr_SOURCES := \
+  $(wildcard $(d)/*.cc) \
+  $(wildcard $(d)/primops/*.cc) \
+  $(wildcard $(d)/flake/*.cc) \
+  $(d)/lexer-tab.cc \
+  $(d)/parser-tab.cc
 
 libexpr_LIBS = libutil libstore
 

src/nix/flake.cc

@@ -4,7 +4,7 @@
 #include "progress-bar.hh"
 #include "eval.hh"
 #include "eval-inline.hh"
-#include "primops/flake.hh"
+#include "flake/flake.hh"
 #include "get-drvs.hh"
 #include "store-api.hh"
 

src/nix/installables.cc

@@ -7,7 +7,7 @@
 #include "get-drvs.hh"
 #include "store-api.hh"
 #include "shared.hh"
-#include "primops/flake.hh"
+#include "flake/flake.hh"
 
 #include <regex>
 #include <queue>