summaryrefslogtreecommitdiff
path: root/nix/libstore
diff options
context:
space:
mode:
Diffstat (limited to 'nix/libstore')
-rw-r--r--nix/libstore/misc.cc8
-rw-r--r--nix/libstore/misc.hh4
-rw-r--r--nix/libstore/store-api.cc17
-rw-r--r--nix/libstore/store-api.hh12
4 files changed, 0 insertions, 41 deletions
diff --git a/nix/libstore/misc.cc b/nix/libstore/misc.cc
index 97618089bd..d4e6d1b4af 100644
--- a/nix/libstore/misc.cc
+++ b/nix/libstore/misc.cc
@@ -59,14 +59,6 @@ void computeFSClosure(StoreAPI & store, const Path & path,
}
-Path findOutput(const Derivation & drv, string id)
-{
- foreach (DerivationOutputs::const_iterator, i, drv.outputs)
- if (i->first == id) return i->second.path;
- throw Error(format("derivation has no output `%1%'") % id);
-}
-
-
static void dfsVisit(StoreAPI & store, const PathSet & paths,
const Path & path, PathSet & visited, Paths & sorted,
PathSet & parents)
diff --git a/nix/libstore/misc.hh b/nix/libstore/misc.hh
index edbf24047e..f70cda9fd0 100644
--- a/nix/libstore/misc.hh
+++ b/nix/libstore/misc.hh
@@ -21,10 +21,6 @@ void computeFSClosure(StoreAPI & store, const Path & path,
PathSet & paths, bool flipDirection = false,
bool includeOutputs = false, bool includeDerivers = false);
-/* Return the path corresponding to the output identifier `id' in the
- given derivation. */
-Path findOutput(const Derivation & drv, string id);
-
bool willBuildLocally(const Derivation & drv);
bool substitutesAllowed(const Derivation & drv);
diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc
index 0de0b6b298..781fb9e693 100644
--- a/nix/libstore/store-api.cc
+++ b/nix/libstore/store-api.cc
@@ -236,17 +236,6 @@ string showPaths(const PathSet & paths)
return s;
}
-
-void exportPaths(StoreAPI & store, const Paths & paths,
- bool sign, Sink & sink)
-{
- foreach (Paths::const_iterator, i, paths) {
- writeInt(1, sink);
- store.exportPath(*i, sign, sink);
- }
- writeInt(0, sink);
-}
-
Path readStorePath(Source & from)
{
Path path = readString(from);
@@ -277,10 +266,4 @@ namespace nix {
std::shared_ptr<StoreAPI> store;
-std::shared_ptr<StoreAPI> openStore(bool reserveSpace)
-{
- return std::shared_ptr<StoreAPI>(new LocalStore(reserveSpace));
-}
-
-
}
diff --git a/nix/libstore/store-api.hh b/nix/libstore/store-api.hh
index 7d2ad2270d..82a79e50e2 100644
--- a/nix/libstore/store-api.hh
+++ b/nix/libstore/store-api.hh
@@ -365,22 +365,10 @@ Paths topoSortPaths(StoreAPI & store, const PathSet & paths);
extern std::shared_ptr<StoreAPI> store;
-/* Factory method: open the Nix database, either through the local or
- remote implementation. */
-std::shared_ptr<StoreAPI> openStore(bool reserveSpace = true);
-
-
/* Display a set of paths in human-readable form (i.e., between quotes
and separated by commas). */
string showPaths(const PathSet & paths);
-
-/* Export multiple paths in the format expected by ‘nix-store
- --import’. */
-void exportPaths(StoreAPI & store, const Paths & paths,
- bool sign, Sink & sink);
-
-
MakeError(SubstError, Error)
MakeError(BuildError, Error) /* denotes a permanent build failure */