nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-13 22:12:43 +01:00
Code Activity

Merge remote-tracking branch 'origin/master' into markdown

Browse source
This commit is contained in:
Eelco Dolstra 2020-07-31 16:07:04 +02:00
commit bf290c2306
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
38 changed files with 475 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/nar-accessor.cc
View file

@ -80,14 +80,14 @@ struct NarAccessor : public FSAccessor
parents.top()->isExecutable = true;
}
void preallocateContents(unsigned long long size) override
void preallocateContents(uint64_t size) override
{
assert(size <= std::numeric_limits<uint64_t>::max());
parents.top()->size = (uint64_t) size;
parents.top()->start = pos;
}
void receiveContents(unsigned char * data, unsigned int len) override
void receiveContents(unsigned char * data, size_t len) override
{ }
void createSymlink(const Path & path, const string & target) override