diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:29:02 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:43:21 -0400 |
commit | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (patch) | |
tree | c7dd5859715071cb602133b67449a29488027f70 /nix/libstore/store-api.cc | |
parent | 513091dbd2eeba138b558f5f9bb1ee6e68eee01d (diff) | |
parent | 3d297a0017210f1dd135592efb10846840a8af88 (diff) |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
Diffstat (limited to 'nix/libstore/store-api.cc')
-rw-r--r-- | nix/libstore/store-api.cc | 17 |
1 files changed, 0 insertions, 17 deletions
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)); -} - - } |