wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Merge branch 'master' of github.com:NixOS/nix into derivation-header-include-order

Browse source
This commit is contained in:
Carlo Nucera 2020-07-15 17:58:30 -04:00
commit 455bdee205
48 changed files with 616 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/derivations.cc
View file

@ -3,7 +3,7 @@
#include "globals.hh"
#include "util.hh"
#include "worker-protocol.hh"
#include "istringstream_nocopy.hh"
#include "fs-accessor.hh"
namespace nix {
@ -100,7 +100,7 @@ static StringSet parseStrings(std::istream & str, bool arePaths)
}
static DerivationOutput parseDerivationOutput(const Store & store, istringstream_nocopy & str)
static DerivationOutput parseDerivationOutput(const Store & store, std::istringstream & str)
{
expect(str, ","); auto path = store.parseStorePath(parsePath(str));
expect(str, ","); auto hashAlgo = parseString(str);
@ -128,10 +128,10 @@ static DerivationOutput parseDerivationOutput(const Store & store, istringstream
}
Derivation parseDerivation(const Store & store, const string & s)
Derivation parseDerivation(const Store & store, std::string && s)
{
Derivation drv;
istringstream_nocopy str(s);
std::istringstream str(std::move(s));
expect(str, "Derive([");
/* Parse the list of outputs. */