Move flake-related stuff to src/libexpr/flake

2019-06-05 16:51:54 +02:00 · 2019-06-05 16:51:54 +02:00 · 54aff8430c
parent 1b05792988
commit 54aff8430c
10 changed files with 10 additions and 5 deletions
--- a/src/libexpr/eval.cc
+++ b/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>
--- a/src/libexpr/primops/flake.cc
+++ b/src/libexpr/primops/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"

--- a/src/libexpr/primops/flake.hh
+++ b/src/libexpr/primops/flake.hh
--- a/src/libexpr/primops/flakeref.cc
+++ b/src/libexpr/primops/flakeref.cc
--- a/src/libexpr/primops/flakeref.hh
+++ b/src/libexpr/primops/flakeref.hh
--- a/src/libexpr/primops/lockfile.cc
+++ b/src/libexpr/primops/lockfile.cc
--- a/src/libexpr/primops/lockfile.hh
+++ b/src/libexpr/primops/lockfile.hh
--- a/src/libexpr/local.mk
+++ b/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

--- a/src/nix/flake.cc
+++ b/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"

--- a/src/nix/installables.cc
+++ b/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>