1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00

Merge remote-tracking branch 'origin/master' into enum-FileIngestionMethod

This commit is contained in:
Carlo Nucera 2020-05-26 11:14:08 -04:00
commit 6d73c10041
159 changed files with 6498 additions and 1881 deletions

View file

@ -1,6 +1,6 @@
#include "hash.hh"
#include "shared.hh"
#include "download.hh"
#include "filetransfer.hh"
#include "store-api.hh"
#include "eval.hh"
#include "eval-inline.hh"
@ -181,9 +181,9 @@ static int _main(int argc, char * * argv)
FdSink sink(fd.get());
DownloadRequest req(actualUri);
FileTransferRequest req(actualUri);
req.decompress = false;
getDownloader()->download(std::move(req), sink);
getFileTransfer()->download(std::move(req), sink);
}
/* Optionally unpack the file. */