1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00

Combine system environment tests and add zsh

This commit is contained in:
Andrew Childs 2018-10-29 09:12:20 +09:00
parent 676ef10377
commit b5fc279d1b
4 changed files with 19 additions and 22 deletions

View file

@ -108,8 +108,7 @@ let
tests.services-synergy = makeTest ./tests/services-synergy.nix; tests.services-synergy = makeTest ./tests/services-synergy.nix;
tests.services-privoxy = makeTest ./tests/services-privoxy.nix; tests.services-privoxy = makeTest ./tests/services-privoxy.nix;
tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix; tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix;
tests.system-environment-bash = makeTest ./tests/system-environment-bash.nix; tests.system-environment = makeTest ./tests/system-environment.nix;
tests.system-environment-fish = makeTest ./tests/system-environment-fish.nix;
tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix; tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix;
tests.system-packages = makeTest ./tests/system-packages.nix; tests.system-packages = makeTest ./tests/system-packages.nix;
tests.system-path = makeTest ./tests/system-path.nix; tests.system-path = makeTest ./tests/system-path.nix;

View file

@ -1,10 +0,0 @@
{ config, pkgs, ... }:
{
programs.bash.enable = true;
test = ''
echo checking setEnvironment in /etc/bashrc >&2
fgrep '. ${config.system.build.setEnvironment}' ${config.out}/etc/bashrc
'';
}

View file

@ -1,10 +0,0 @@
{ config, pkgs, ... }:
{
programs.fish.enable = true;
test = ''
echo checking setEnvironment in /etc/fish/config.fish >&2
grep 'fenv source ${config.system.build.setEnvironment}' ${config.out}/etc/fish/nixos-env-preinit.fish
'';
}

View file

@ -0,0 +1,18 @@
{ config, pkgs, ... }:
{
programs.bash.enable = true;
programs.fish.enable = true;
programs.zsh.enable = true;
test = ''
echo checking setEnvironment in /etc/bashrc >&2
fgrep '. ${config.system.build.setEnvironment}' ${config.out}/etc/bashrc
echo checking setEnvironment in /etc/fish/nixos-env-preinit.fish >&2
grep 'fenv source ${config.system.build.setEnvironment}' ${config.out}/etc/fish/nixos-env-preinit.fish
echo checking setEnvironment in /etc/zshenv >&2
fgrep '. ${config.system.build.setEnvironment}' ${config.out}/etc/zshenv
'';
}