diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-12-16 23:33:01 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-12-16 23:33:01 +0000 |
| commit | 194d21f9f63ceb034f3e8294f89aa6bf6a217bc9 (patch) | |
| tree | 7eb6da5955482a82f4d34b60dcb10514a4a55f59 /src/libstore/worker-protocol.hh | |
| parent | 3c3107da86ff71a08ce44027ee5899acf486796a (diff) | |
| parent | 273b288a7e862ac1918064537ff130cc751fa9fd (diff) | |
* Sync with the trunk.
Diffstat (limited to 'src/libstore/worker-protocol.hh')
| -rw-r--r-- | src/libstore/worker-protocol.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index 576e754d2..ef1e0993d 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -8,7 +8,7 @@ namespace nix { #define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_2 0x6478696f -#define PROTOCOL_VERSION 0x108 +#define PROTOCOL_VERSION 0x109 #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) @@ -29,7 +29,6 @@ typedef enum { wopSyncWithGC = 13, wopFindRoots = 14, wopExportPath = 16, - wopImportPath = 17, wopQueryDeriver = 18, wopSetOptions = 19, wopCollectGarbage = 20, @@ -39,7 +38,8 @@ typedef enum { wopQueryFailedPaths = 24, wopClearFailedPaths = 25, wopQueryPathInfo = 26, - wopQueryDerivationOutputNames = 27, + wopImportPaths = 27, + wopQueryDerivationOutputNames = 28, } WorkerOp; @@ -59,7 +59,7 @@ typedef enum { Path readStorePath(Source & from); -PathSet readStorePaths(Source & from); +template<class T> T readStorePaths(Source & from); } |