Mirrors/home-manager
2
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-23 05:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

home-manager: handle profile list in Nix >2.17

Browse source 
Nix 2.17 changed the format of the `nix profile list` output. This
commit adds support for parsing the new JSON profile list format.

Fixes #4298
This commit is contained in:
Robert Helgesson 2023-08-08 12:19:01 +02:00
parent 406d34d919
commit c3ab5ea047
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
3 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
home-manager/default.nix
View file

@ -1,4 +1,4 @@
{ runCommand, lib, bash, callPackage, coreutils, findutils, gettext, gnused { runCommand, lib, bash, callPackage, coreutils, findutils, gettext, gnused, jq
, less, ncurses, unixtools , less, ncurses, unixtools
# used for pkgs.path for nixos-option # used for pkgs.path for nixos-option
, pkgs , pkgs
@ -34,6 +34,7 @@ in runCommand "home-manager" {
findutils findutils
gettext gettext
gnused gnused
jq
less less
ncurses ncurses
nixos-option nixos-option

18
home-manager/home-manager
View file

@ -11,11 +11,21 @@ export TEXTDOMAINDIR=@OUT@/share/locale
# shellcheck disable=1091 # shellcheck disable=1091
source @HOME_MANAGER_LIB@ source @HOME_MANAGER_LIB@
function removeByName() { function nixProfileList() {
# We attempt to use `--json` first (added in Nix 2.17). Otherwise attempt to
# parse the legacy output format.
{
nix profile list --json 2>/dev/null \
| jq -r --arg name "$1" '.elements[].storePaths[] | select(endswith($name))'
} || {
nix profile list \ nix profile list \
| { grep "$1" || test $? = 1; } \ | { grep "$1\$" || test $? = 1; } \
| cut -d ' ' -f 4 \ | cut -d ' ' -f 4
| xargs -t $DRY_RUN_CMD nix profile remove $VERBOSE_ARG }
}
function removeByName() {
nixProfileList "$1" | xargs -t $DRY_RUN_CMD nix profile remove $VERBOSE_ARG
} }
function setNixProfileCommands() { function setNixProfileCommands() {

25
modules/home-environment.nix
View file

@ -598,13 +598,27 @@ in
'' ''
else else
'' ''
function nixProfileList() {
# We attempt to use `--json` first (added in Nix 2.17). Otherwise attempt to
# parse the legacy output format.
{
nix profile list --json 2>/dev/null \
| jq -r --arg name "$1" '.elements[].storePaths[] | select(endswith($name))'
} || {
nix profile list \
| { grep "$1\$" || test $? = 1; } \
| cut -d ' ' -f 4
}
}
function nixRemoveProfileByName() {
nixProfileList "$1" | xargs -t $DRY_RUN_CMD nix profile remove $VERBOSE_ARG
}
function nixReplaceProfile() { function nixReplaceProfile() {
local oldNix="$(command -v nix)" local oldNix="$(command -v nix)"
nix profile list \ nixRemoveProfileByName 'home-manager-path'
| { grep 'home-manager-path$' || test $? = 1; } \
| cut -d ' ' -f 4 \
| xargs -t $DRY_RUN_CMD nix profile remove $VERBOSE_ARG
$DRY_RUN_CMD $oldNix profile install $1 $DRY_RUN_CMD $oldNix profile install $1
} }
@ -626,7 +640,7 @@ in
_iError $'Oops, Nix failed to install your new Home Manager profile!\n\nPerhaps there is a conflict with a package that was installed using\n"%s"? Try running\n\n %s\n\nand if there is a conflicting package you can remove it with\n\n %s\n\nThen try activating your Home Manager configuration again.' "$INSTALL_CMD" "$LIST_CMD" "$REMOVE_CMD_SYNTAX" _iError $'Oops, Nix failed to install your new Home Manager profile!\n\nPerhaps there is a conflict with a package that was installed using\n"%s"? Try running\n\n %s\n\nand if there is a conflicting package you can remove it with\n\n %s\n\nThen try activating your Home Manager configuration again.' "$INSTALL_CMD" "$LIST_CMD" "$REMOVE_CMD_SYNTAX"
exit 1 exit 1
fi fi
unset -f nixReplaceProfile unset -f nixProfileList nixRemoveProfileByName nixReplaceProfile
unset INSTALL_CMD INSTALL_CMD_ACTUAL LIST_CMD REMOVE_CMD_SYNTAX unset INSTALL_CMD INSTALL_CMD_ACTUAL LIST_CMD REMOVE_CMD_SYNTAX
'' ''
); );
@ -678,6 +692,7 @@ in
gettext gettext
gnugrep gnugrep
gnused gnused
jq
ncurses # For `tput`. ncurses # For `tput`.
] ]
++ config.home.extraActivationPath ++ config.home.extraActivationPath