Skip to content

Fix activation under Nix 2.3 and stop run function from discarding error messages #5067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rycee merged 2 commits into from
Mar 8, 2024
Merged

Fix activation under Nix 2.3 and stop run function from discarding error messages #5067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3a9fb9
treewide: stop `run` from discarding error messages
deviant Feb 28, 2024
1743197
files: fix activation under Nix 2.3
deviant Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/bash/home-manager.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,26 @@ function _iVerbose() {
# Runs the given command on live run, otherwise prints the command to standard
# output.
#
# If given the command line option `--quiet`, then the command's standard output
# is sent to `/dev/null` on a live run.
#
# If given the command line option `--silence`, then the command's standard and
# error output is sent to `/dev/null` on a live run.
#
# The `--silence` and `--quiet` flags are mutually exclusive.
function run() {
if [[ $1 == '--silence' ]]; then
if [[ $1 == '--quiet' ]]; then
local quiet=1
shift
elif [[ $1 == '--silence' ]]; then
local silence=1
shift
fi

if [[ -v DRY_RUN ]] ; then
echo "$@"
elif [[ -v quiet ]] ; then
"$@" > /dev/null
elif [[ -v silence ]] ; then
"$@" > /dev/null 2>&1
else
Expand Down
2 changes: 1 addition & 1 deletion modules/files.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ in
run nix-env $VERBOSE_ARG --profile "$genProfilePath" --set "$newGenPath"
fi

run --silence nix-store --realise "$newGenPath" --add-root "$newGenGcPath"
run --quiet nix-store --realise "$newGenPath" --add-root "$newGenGcPath" --indirect
if [[ -e "$legacyGenGcPath" ]]; then
run rm $VERBOSE_ARG "$legacyGenGcPath"
fi
Expand Down
6 changes: 6 additions & 0 deletions modules/home-environment.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,17 @@ in
: Runs the given command on live run, otherwise prints the command to
standard output.

{command}`run --quiet {command}`
: Runs the given command on live run and sends its standard output to
{file}`/dev/null`, otherwise prints the command to standard output.

{command}`run --silence {command}`
: Runs the given command on live run and sends its standard and error
output to {file}`/dev/null`, otherwise prints the command to standard
output.

The `--quiet` and `--silence` flags are mutually exclusive.

A script block should also respect the {var}`VERBOSE` variable, and if
set print information on standard out that may be useful for debugging
any issue that may arise. The variable {var}`VERBOSE_ARG` is set to
Expand Down
2 changes: 1 addition & 1 deletion modules/lib-bash/activation-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function nixProfileRemove() {
nixProfileList "$1" | xargs -rt $DRY_RUN_CMD nix profile remove $VERBOSE_ARG
else
if nix-env -q | grep -q "^$1$"; then
run --silence nix-env -e "$1"
run --quiet nix-env -e "$1"
fi
fi
}
Expand Down