aboutsummaryrefslogtreecommitdiff
path: root/src/nix-store
diff options
context:
space:
mode:
Diffstat (limited to 'src/nix-store')
-rw-r--r--src/nix-store/nix-store.cc4
-rw-r--r--src/nix-store/serve-protocol.hh23
2 files changed, 1 insertions, 26 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index c1e6afef0..0aabe66c5 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -922,9 +922,7 @@ static void opServe(Strings opFlags, Strings opArgs)
case cmdExportPaths: {
readInt(in); // obsolete
- Paths sorted = store->topoSortPaths(readStorePaths<PathSet>(*store, in));
- reverse(sorted.begin(), sorted.end());
- store->exportPaths(sorted, out);
+ store->exportPaths(readStorePaths<Paths>(*store, in), out);
break;
}
diff --git a/src/nix-store/serve-protocol.hh b/src/nix-store/serve-protocol.hh
deleted file mode 100644
index f8cc9a4b6..000000000
--- a/src/nix-store/serve-protocol.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-namespace nix {
-
-#define SERVE_MAGIC_1 0x390c9deb
-#define SERVE_MAGIC_2 0x5452eecb
-
-#define SERVE_PROTOCOL_VERSION 0x203
-#define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00)
-#define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff)
-
-typedef enum {
- cmdQueryValidPaths = 1,
- cmdQueryPathInfos = 2,
- cmdDumpStorePath = 3,
- cmdImportPaths = 4,
- cmdExportPaths = 5,
- cmdBuildPaths = 6,
- cmdQueryClosure = 7,
- cmdBuildDerivation = 8,
-} ServeCommand;
-
-}