public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15596 from rnhmjoj/master

Browse Source 
fish: 2.2.0 -> 2.3.0
This commit is contained in:
Joachim Fasting
2016-05-28 00:53:12 +02:00
parent 852fa5cc59 17ec9368cd
commit 44548c8a9e
5 changed files with 70 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/programs/fish.nix
View File

@@ -84,19 +84,19 @@ in
set fish_function_path $fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions
fenv source ${config.system.build.setEnvironment} 1> /dev/null
fenv source /etc/fish/foreign-env/shellInit 1> /dev/null
fenv source ${config.system.build.setEnvironment} > /dev/null ^&1
fenv source /etc/fish/foreign-env/shellInit > /dev/null
${cfg.shellInit}
if builtin status --is-login
fenv source /etc/fish/foreign-env/loginShellInit 1> /dev/null
if status --is-login
fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
${cfg.loginShellInit}
end
if builtin status --is-interactive
if status --is-interactive
${fishAliases}
fenv source /etc/fish/foreign-env/interactiveShellInit 1> /dev/null
fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
${cfg.interactiveShellInit}
end
'';