diff options
author | Griffin Smith <grfn@gws.fyi> | 2020-07-25T22·44-0400 |
---|---|---|
committer | glittershark <grfn@gws.fyi> | 2020-08-01T14·11+0000 |
commit | 05e44c121d25575e17ded0f6b407347e4b987d0d (patch) | |
tree | 9a245375a0b3c059da64c00674596e835cd3b26e /third_party/nix/src/nix-daemon/nix-daemon.cc | |
parent | 1fe4a47aa29e3d522160b34aa60d5458ad54916b (diff) |
feat(3p/nix): Implement AddToStore proto handler r/1519
Implement the proto handler for AddToStore, which adds a nix path to the store. This is implemented by adding a new (probably soon-to-be-generalized) Source concretion that wraps a grpc ServerReader for the stream of data we're receiving from the client - this is less than ideal, as it's perpetuating the source/sink thing that's going on and storing entire nars in memory, but is at the very worst an incremental step towards a functioning nix that we can refactor in the future. Paired-With: Perry Lorier <isomer@tvl.fyi> Paired-With: Vincent Ambo <mail@tazj.in> Change-Id: I48db734e7460a47aee4a85dd5137b690980859e3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1441 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party/nix/src/nix-daemon/nix-daemon.cc')
-rw-r--r-- | third_party/nix/src/nix-daemon/nix-daemon.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/nix/src/nix-daemon/nix-daemon.cc b/third_party/nix/src/nix-daemon/nix-daemon.cc index caff57851f93..fdb539d6628c 100644 --- a/third_party/nix/src/nix-daemon/nix-daemon.cc +++ b/third_party/nix/src/nix-daemon/nix-daemon.cc @@ -298,15 +298,15 @@ static void performOp(TunnelLogger* logger, const ref<Store>& store, case wopAddToStore: { bool fixed = 0; bool recursive = 0; - std::string s; + std::string hashType; std::string baseName; - from >> baseName >> fixed /* obsolete */ >> recursive >> s; + from >> baseName >> fixed /* obsolete */ >> recursive >> hashType; /* Compatibility hack. */ if (!fixed) { - s = "sha256"; + hashType = "sha256"; recursive = true; } - HashType hashAlgo = parseHashType(s); + HashType hashAlgo = parseHashType(hashType); TeeSource savedNAR(from); RetrieveRegularNARSink savedRegular; |