about summary refs log tree commit diff
path: root/src/libstore/store-api.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-02-22T15·31+0100
committerEelco Dolstra <edolstra@gmail.com>2017-02-22T15·58+0100
commitf023f64f40809afa8a8e3a5e7081209cbcfd2e7e (patch)
tree46e7da4c94037a598c37887f6ccf7597758ddf18 /src/libstore/store-api.cc
parentfe2db1dae59f379eda793da952425a8331139c65 (diff)
RemoteStore::addToStore(): Pass content-addressability assertion
... and use this in Downloader::downloadCached(). This fixes

  $ nix-build https://nixos.org/channels/nixos-16.09-small/nixexprs.tar.xz -A hello
  error: cannot import path ‘/nix/store/csfbp1s60dkgmk9f8g0zk0mwb7hzgabd-nixexprs.tar.xz’ because it lacks a valid signature
Diffstat (limited to 'src/libstore/store-api.cc')
-rw-r--r--src/libstore/store-api.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index b5934a0d12..401b001b2d 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -676,6 +676,12 @@ Strings ValidPathInfo::shortRefs() const
 }
 
 
+std::string makeFixedOutputCA(bool recursive, const Hash & hash)
+{
+    return "fixed:" + (recursive ? (std::string) "r:" : "") + hash.to_string();
+}
+
+
 }