Skip to content

Commit abcfa4b

Browse files
committed
home-manager: add minor improvements
- add `jq` dependency, following upstream - use `--cmd` with `installShellCompletion` - remove unnecessary `placeholder`s - add myself @bryango to maintainers See: https://github.com/nix-community/home-manager/blob/master/home-manager/default.nix
1 parent ce9dcd2 commit abcfa4b

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

pkgs/by-name/ho/home-manager/package.nix

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
, findutils
66
, gettext
77
, gnused
8+
, inetutils
89
, installShellFiles
10+
, jq
911
, less
1012
, ncurses
1113
, nixos-option
@@ -40,9 +42,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
4042
install -D -m755 home-manager/home-manager $out/bin/home-manager
4143
install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh
4244
43-
installShellCompletion --bash --name home-manager.bash home-manager/completion.bash
44-
installShellCompletion --fish --name home-manager.fish home-manager/completion.fish
45-
installShellCompletion --zsh --name _home-manager home-manager/completion.zsh
45+
installShellCompletion --cmd home-manager \
46+
--bash home-manager/completion.bash \
47+
--fish home-manager/completion.fish \
48+
--zsh home-manager/completion.zsh
4649
4750
for pofile in home-manager/po/*.po; do
4851
lang="''${pofile##*/}"
@@ -63,15 +66,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
6366
findutils
6467
gettext
6568
gnused
69+
jq
6670
less
6771
ncurses
6872
nixos-option
6973
inetutils # for `hostname`
7074
]
7175
}" \
72-
--subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \
76+
--subst-var-by HOME_MANAGER_LIB "$out/share/bash/home-manager.sh" \
7377
--subst-var-by HOME_MANAGER_PATH "${finalAttrs.src}" \
74-
--subst-var-by OUT '${placeholder "out"}'
78+
--subst-var-by OUT "$out"
7579
'';
7680

7781
passthru.updateScript = unstableGitUpdater {
@@ -89,7 +93,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
8993
'';
9094
license = lib.licenses.mit;
9195
mainProgram = "home-manager";
92-
maintainers = with lib.maintainers; [ AndersonTorres ];
96+
maintainers = with lib.maintainers; [ AndersonTorres bryango ];
9397
platforms = lib.platforms.unix;
9498
};
9599
})

0 commit comments

Comments
 (0)