mirror of
https://github.com/NixOS/nix
synced 2025-07-07 14:21:48 +02:00
Merge remote-tracking branch 'detsys-priv/detsys-main' into sync-2.24.2
This commit is contained in:
commit
27a36255bf
37 changed files with 41 additions and 178 deletions
|
@ -123,7 +123,8 @@ startDaemon() {
|
|||
fi
|
||||
# Start the daemon, wait for the socket to appear.
|
||||
rm -f $NIX_DAEMON_SOCKET_PATH
|
||||
PATH=$DAEMON_PATH nix --extra-experimental-features 'nix-command' daemon &
|
||||
# TODO: remove the nix-command feature when we're no longer testing against old daemons.
|
||||
PATH=$DAEMON_PATH nix daemon --extra-experimental-features nix-command &
|
||||
_NIX_TEST_DAEMON_PID=$!
|
||||
export _NIX_TEST_DAEMON_PID
|
||||
for ((i = 0; i < 300; i++)); do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue