Merge e7eff97c9953e972a6db375820a858849b409fa5 into a56e3a80896f10bfe28feea2c49695c0225b2485

This commit is contained in:
Domen Kožar 2023-11-12 02:25:00 -07:00 committed by GitHub
commit 481508e13c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -36,7 +36,7 @@ if [[ -n "${INPUT_EXTRA_NIX_CONFIG:-}" ]]; then
add_config "$INPUT_EXTRA_NIX_CONFIG" add_config "$INPUT_EXTRA_NIX_CONFIG"
fi fi
if [[ ! $INPUT_EXTRA_NIX_CONFIG =~ "experimental-features" ]]; then if [[ ! $INPUT_EXTRA_NIX_CONFIG =~ "experimental-features" ]]; then
add_config "experimental-features = nix-command flakes" add_config "experimental-features = nix-command flakes auto-allocate-uids"
fi fi
# Nix installer flags # Nix installer flags
@ -50,8 +50,9 @@ installer_options=(
if [[ (! $INPUT_INSTALL_OPTIONS =~ "--no-daemon") && ($OSTYPE =~ darwin || -e /run/systemd/system) ]]; then if [[ (! $INPUT_INSTALL_OPTIONS =~ "--no-daemon") && ($OSTYPE =~ darwin || -e /run/systemd/system) ]]; then
installer_options+=( installer_options+=(
--daemon --daemon
--daemon-user-count "$(python3 -c 'import multiprocessing as mp; print(mp.cpu_count() * 2)')" --daemon-user-count 1
) )
add_config "auto-allocate-uids = true"
else else
# "fix" the following error when running nix* # "fix" the following error when running nix*
# error: the group 'nixbld' specified in 'build-users-group' does not exist # error: the group 'nixbld' specified in 'build-users-group' does not exist