NixOS · Jun 5, 2019
diff --git 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>

diff --git a/src/libexpr/primops/flake.cc → src/libexpr/flake/flake.cc b/src/libexpr/primops/flake.cc → 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"
 

diff --git a/src/libexpr/primops/flake.hh → src/libexpr/flake/flake.hh b/src/libexpr/primops/flake.hh → src/libexpr/flake/flake.hh
diff --git a/src/libexpr/primops/flakeref.cc → src/libexpr/flake/flakeref.cc b/src/libexpr/primops/flakeref.cc → src/libexpr/flake/flakeref.cc
diff --git a/src/libexpr/primops/flakeref.hh → src/libexpr/flake/flakeref.hh b/src/libexpr/primops/flakeref.hh → src/libexpr/flake/flakeref.hh
diff --git a/src/libexpr/primops/lockfile.cc → src/libexpr/flake/lockfile.cc b/src/libexpr/primops/lockfile.cc → src/libexpr/flake/lockfile.cc
diff --git a/src/libexpr/primops/lockfile.hh → src/libexpr/flake/lockfile.hh b/src/libexpr/primops/lockfile.hh → src/libexpr/flake/lockfile.hh
diff --git 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
 

diff --git 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"
 

diff --git 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>