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

Remove the NIX_GC_SOCKET_PATH environment variable

Browse source 
Not really needed since it's configurable from the config (and people
can always use `$NIX_CONFIG` if they really need to configure it from
the CLI)
This commit is contained in:
Théophane Hufschmitt 2023-06-26 08:58:40 +02:00
parent 19d7d7ac42
commit 65387ad3ea
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/globals.hh
View file

@ -96,7 +96,7 @@ public:
Setting<std::string> gcSocketPath { Setting<std::string> gcSocketPath {
this, this,
getEnv("NIX_GC_SOCKET_PATH").value_or("auto"), "auto",
"gc-socket-path", "gc-socket-path",
"Path to the socket used to communicate with an external GC." "Path to the socket used to communicate with an external GC."
}; };

2
tests/gc-external-daemon.sh
View file

@ -3,6 +3,8 @@ source common.sh
sed -i 's/experimental-features .*/& external-gc-daemon/' "$NIX_CONF_DIR"/nix.conf sed -i 's/experimental-features .*/& external-gc-daemon/' "$NIX_CONF_DIR"/nix.conf
export NIX_GC_SOCKET_PATH=$TEST_ROOT/gc.socket export NIX_GC_SOCKET_PATH=$TEST_ROOT/gc.socket
echo "gc-socket-path = $NIX_GC_SOCKET_PATH"
startGcDaemon() { startGcDaemon() {
# Start the daemon, wait for the socket to appear. !!! # Start the daemon, wait for the socket to appear. !!!
# ‘nix-daemon’ should have an option to fork into the background. # ‘nix-daemon’ should have an option to fork into the background.