aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/download.hh
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2018-05-15 14:57:18 +0200
committerGitHub <noreply@github.com>2018-05-15 14:57:18 +0200
commit966407bcf1cf86de508b20fef43cffb81d8a87dc (patch)
treee3c2ef406ae80f3f30cbb95830e7aa38ae590839 /src/libstore/download.hh
parent1ad19232c4bbecb06e6acbb2a3a538544a28e1f2 (diff)
parentb9289e4855d0221825c6f673d64f69802daa6b42 (diff)
Merge pull request #2145 from serokell/uncached-channel
make sure not to use cached channels for nix-channel --update
Diffstat (limited to 'src/libstore/download.hh')
-rw-r--r--src/libstore/download.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/download.hh b/src/libstore/download.hh
index 0b8d29b21..7ade756fc 100644
--- a/src/libstore/download.hh
+++ b/src/libstore/download.hh
@@ -2,6 +2,7 @@
#include "types.hh"
#include "hash.hh"
+#include "globals.hh"
#include <string>
#include <future>
@@ -54,7 +55,7 @@ struct Downloader
use the recorded ETag to verify if the server has a more
recent version, and if so, download it to the Nix store. */
Path downloadCached(ref<Store> store, const string & uri, bool unpack, string name = "",
- const Hash & expectedHash = Hash(), string * effectiveUri = nullptr);
+ const Hash & expectedHash = Hash(), string * effectiveUri = nullptr, int ttl = settings.tarballTtl);
enum Error { NotFound, Forbidden, Misc, Transient, Interrupted };
};