eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-01 08:49:44 +01:00
Code Issues Releases Wiki Activity

granted: use assume directly

Browse source 
The `.assume-wrapped` path is not available since the merge of

    https://github.com/NixOS/nixpkgs/pull/347816

Use assume directly instead.

PR #5994
This commit is contained in:
Willi Carlsen 2024-10-23 14:07:07 +02:00 committed by Robert Helgesson
parent 0a0b1b18bd
commit 454e8d6b15
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/programs/granted.nix
View file

@ -28,7 +28,7 @@ in {
programs.zsh.initExtra = mkIf cfg.enableZshIntegration '' programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
function assume() { function assume() {
export GRANTED_ALIAS_CONFIGURED="true" export GRANTED_ALIAS_CONFIGURED="true"
source ${package}/bin/.assume-wrapped "$@" source ${package}/bin/assume "$@"
unset GRANTED_ALIAS_CONFIGURED unset GRANTED_ALIAS_CONFIGURED
} }
''; '';

2
tests/modules/programs/granted/integration-disabled.nix
View file

@ -19,7 +19,7 @@
'export GRANTED_ALIAS_CONFIGURED="true"' 'export GRANTED_ALIAS_CONFIGURED="true"'
assertFileNotRegex \ assertFileNotRegex \
home-files/.zshrc \ home-files/.zshrc \
'source @granted@/bin/.assume-wrapped "$@"' 'source @granted@/bin/assume "$@"'
assertFileNotRegex \ assertFileNotRegex \
home-files/.zshrc \ home-files/.zshrc \
'unset GRANTED_ALIAS_CONFIGURED' 'unset GRANTED_ALIAS_CONFIGURED'

2
tests/modules/programs/granted/integration-enabled.nix
View file

@ -18,7 +18,7 @@
'export GRANTED_ALIAS_CONFIGURED="true"' 'export GRANTED_ALIAS_CONFIGURED="true"'
assertFileContains \ assertFileContains \
home-files/.zshrc \ home-files/.zshrc \
'source @granted@/bin/.assume-wrapped "$@"' 'source @granted@/bin/assume "$@"'
assertFileContains \ assertFileContains \
home-files/.zshrc \ home-files/.zshrc \
'unset GRANTED_ALIAS_CONFIGURED' 'unset GRANTED_ALIAS_CONFIGURED'