From 676ef103771aa3fc4b150290294b8ad5610d2750 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 25 Oct 2018 00:30:34 +0900 Subject: Unify environment configuration and don't run in child shells This should enable `nix run` to work under shells like fish and zsh, as well as making child shells not needlessly reset any environment that should be inherited. Implementation adapted from NixOS. --- release.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index 6721a52..a7016b7 100644 --- a/release.nix +++ b/release.nix @@ -108,10 +108,11 @@ let tests.services-synergy = makeTest ./tests/services-synergy.nix; tests.services-privoxy = makeTest ./tests/services-privoxy.nix; tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix; + tests.system-environment-bash = makeTest ./tests/system-environment-bash.nix; + tests.system-environment-fish = makeTest ./tests/system-environment-fish.nix; tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix; tests.system-packages = makeTest ./tests/system-packages.nix; - tests.system-path-bash = makeTest ./tests/system-path-bash.nix; - tests.system-path-fish = makeTest ./tests/system-path-fish.nix; + tests.system-path = makeTest ./tests/system-path.nix; tests.system-shells = makeTest ./tests/system-shells.nix; tests.users-groups = makeTest ./tests/users-groups.nix; tests.fonts = makeTest ./tests/fonts.nix; -- cgit v1.2.3