From d8fa7517fad4272e20ff9b9b740c91158bc685e2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 5 Apr 2021 10:33:28 -0400
Subject: [PATCH] buildable.{cc,hh} -> derived-path.{cc,hh}

---
 src/libcmd/installables.hh                     | 2 +-
 src/libmain/shared.hh                          | 2 +-
 src/libstore/{buildable.cc => derived-path.cc} | 2 +-
 src/libstore/{buildable.hh => derived-path.hh} | 0
 src/libstore/path-with-outputs.hh              | 2 +-
 src/libstore/store-api.hh                      | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/libstore/{buildable.cc => derived-path.cc} (98%)
 rename src/libstore/{buildable.hh => derived-path.hh} (100%)

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
similarity index 98%
rename from src/libstore/buildable.cc
rename to 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
similarity index 100%
rename from src/libstore/buildable.hh
rename to 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"