aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-04-05 10:33:28 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2021-04-05 10:33:28 -0400
commitd8fa7517fad4272e20ff9b9b740c91158bc685e2 (patch)
tree762177a895898255d12e74ce479e171ba902a98b
parent179582872de60863fcabcf471f98930a25fd6df3 (diff)
buildable.{cc,hh} -> derived-path.{cc,hh}
-rw-r--r--src/libcmd/installables.hh2
-rw-r--r--src/libmain/shared.hh2
-rw-r--r--src/libstore/derived-path.cc (renamed from src/libstore/buildable.cc)2
-rw-r--r--src/libstore/derived-path.hh (renamed from src/libstore/buildable.hh)0
-rw-r--r--src/libstore/path-with-outputs.hh2
-rw-r--r--src/libstore/store-api.hh2
6 files changed, 5 insertions, 5 deletions
diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh
index 0bc932b52..403403c07 100644
--- a/src/libcmd/installables.hh
+++ b/src/libcmd/installables.hh
@@ -3,7 +3,7 @@
#include "util.hh"
#include "path.hh"
#include "path-with-outputs.hh"
-#include "buildable.hh"
+#include "derived-path.hh"
#include "eval.hh"
#include "flake/flake.hh"
diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh
index 9cb9e6da2..05277d90a 100644
--- a/src/libmain/shared.hh
+++ b/src/libmain/shared.hh
@@ -4,7 +4,7 @@
#include "args.hh"
#include "common-args.hh"
#include "path.hh"
-#include "buildable.hh"
+#include "derived-path.hh"
#include <signal.h>
diff --git a/src/libstore/buildable.cc b/src/libstore/derived-path.cc
index eee38ba10..13833c58e 100644
--- a/src/libstore/buildable.cc
+++ b/src/libstore/derived-path.cc
@@ -1,4 +1,4 @@
-#include "buildable.hh"
+#include "derived-path.hh"
#include "store-api.hh"
#include <nlohmann/json.hpp>
diff --git a/src/libstore/buildable.hh b/src/libstore/derived-path.hh
index ce5ae5fc0..ce5ae5fc0 100644
--- a/src/libstore/buildable.hh
+++ b/src/libstore/derived-path.hh
diff --git a/src/libstore/path-with-outputs.hh b/src/libstore/path-with-outputs.hh
index 749348398..4c4023dcb 100644
--- a/src/libstore/path-with-outputs.hh
+++ b/src/libstore/path-with-outputs.hh
@@ -3,7 +3,7 @@
#include <variant>
#include "path.hh"
-#include "buildable.hh"
+#include "derived-path.hh"
namespace nix {
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 483f3c5fa..f66298991 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -2,7 +2,7 @@
#include "realisation.hh"
#include "path.hh"
-#include "buildable.hh"
+#include "derived-path.hh"
#include "hash.hh"
#include "content-address.hh"
#include "serialise.hh"