From 54aff8430c4e7739903f6dbed713cc088e38507f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 5 Jun 2019 16:51:54 +0200
Subject: [PATCH] Move flake-related stuff to src/libexpr/flake

---
 src/libexpr/eval.cc                        | 2 +-
 src/libexpr/{primops => flake}/flake.cc    | 2 +-
 src/libexpr/{primops => flake}/flake.hh    | 0
 src/libexpr/{primops => flake}/flakeref.cc | 0
 src/libexpr/{primops => flake}/flakeref.hh | 0
 src/libexpr/{primops => flake}/lockfile.cc | 0
 src/libexpr/{primops => flake}/lockfile.hh | 0
 src/libexpr/local.mk                       | 7 ++++++-
 src/nix/flake.cc                           | 2 +-
 src/nix/installables.cc                    | 2 +-
 10 files changed, 10 insertions(+), 5 deletions(-)
 rename src/libexpr/{primops => flake}/flake.cc (99%)
 rename src/libexpr/{primops => flake}/flake.hh (100%)
 rename src/libexpr/{primops => flake}/flakeref.cc (100%)
 rename src/libexpr/{primops => flake}/flakeref.hh (100%)
 rename src/libexpr/{primops => flake}/lockfile.cc (100%)
 rename src/libexpr/{primops => flake}/lockfile.hh (100%)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 0f8a105b1..46c622ee8 100644
--- 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 b/src/libexpr/flake/flake.cc
similarity index 99%
rename from src/libexpr/primops/flake.cc
rename to src/libexpr/flake/flake.cc
index 793d6da35..bb0543541 100644
--- a/src/libexpr/primops/flake.cc
+++ b/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 b/src/libexpr/flake/flake.hh
similarity index 100%
rename from src/libexpr/primops/flake.hh
rename to src/libexpr/flake/flake.hh
diff --git a/src/libexpr/primops/flakeref.cc b/src/libexpr/flake/flakeref.cc
similarity index 100%
rename from src/libexpr/primops/flakeref.cc
rename to src/libexpr/flake/flakeref.cc
diff --git a/src/libexpr/primops/flakeref.hh b/src/libexpr/flake/flakeref.hh
similarity index 100%
rename from src/libexpr/primops/flakeref.hh
rename to src/libexpr/flake/flakeref.hh
diff --git a/src/libexpr/primops/lockfile.cc b/src/libexpr/flake/lockfile.cc
similarity index 100%
rename from src/libexpr/primops/lockfile.cc
rename to src/libexpr/flake/lockfile.cc
diff --git a/src/libexpr/primops/lockfile.hh b/src/libexpr/flake/lockfile.hh
similarity index 100%
rename from src/libexpr/primops/lockfile.hh
rename to src/libexpr/flake/lockfile.hh
diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk
index ccd5293e4..a9cb6b7b6 100644
--- 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
index 653154aaa..af1a361b3 100644
--- 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
index ca88ec0da..a85295a09 100644
--- 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>