mirror of
https://github.com/NixOS/nix.git
synced 2025-12-05 16:41:01 +01:00
Merge commit 'df552ff53e' into progress-bar
This commit is contained in:
commit
38949e6be4
259 changed files with 3960 additions and 29251 deletions
|
|
@ -62,7 +62,7 @@ public:
|
|||
|
||||
void timedOut(Error && ex) override { abort(); };
|
||||
|
||||
string key() override
|
||||
std::string key() override
|
||||
{
|
||||
/* "a$" ensures substitution goals happen before derivation
|
||||
goals. */
|
||||
|
|
@ -80,7 +80,7 @@ public:
|
|||
void finished();
|
||||
|
||||
/* Callback used by the worker to write to the log. */
|
||||
void handleChildOutput(int fd, const string & data) override;
|
||||
void handleChildOutput(int fd, std::string_view data) override;
|
||||
void handleEOF(int fd) override;
|
||||
|
||||
void cleanup() override;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue