nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-18 08:19:35 +01:00
Code Activity

Merge branch 'master' of github.com:NixOS/nix into trustless-remote-builder-simple

Browse source
This commit is contained in:
John Ericson 2020-10-12 23:00:18 +00:00
commit bdc7720227
161 changed files with 2017 additions and 1251 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/nix-daemon/nix-daemon.cc
View file

@ -265,7 +265,7 @@ static void daemonLoop(char * * argv)
}
static int _main(int argc, char * * argv)
static int main_nix_daemon(int argc, char * * argv)
{
{
auto stdio = false;
@ -345,4 +345,4 @@ static int _main(int argc, char * * argv)
}
}
static RegisterLegacyCommand s1("nix-daemon", _main);
static RegisterLegacyCommand r_nix_daemon("nix-daemon", main_nix_daemon);