diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-09-14 21:23:18 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-09-14 21:40:19 +0200 |
| commit | 48f3ed6301e73955898ae66e6c29b2caac4a680d (patch) | |
| tree | 843be139ac870614fd041b51c0ae7f1589df8d38 /tests | |
| parent | 9347dc05d18e1359b9e32abc74281a8e85b56421 (diff) | |
nix: only set NIX_REMOTE for nix 1.11
This isn't needed anymore, nix 2.0 figures this out automatically now.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/programs-zsh.nix | 3 | ||||
| -rw-r--r-- | tests/services-nix-daemon.nix | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/programs-zsh.nix b/tests/programs-zsh.nix index 2b6bf39..97afe47 100644 --- a/tests/programs-zsh.nix +++ b/tests/programs-zsh.nix @@ -24,9 +24,6 @@ grep 'export PATH=${pkgs.hello}/bin' ${config.out}/etc/zshenv echo >&2 "checking SHELL in /etc/zshenv" grep 'export SHELL="${pkgs.zsh}/bin/zsh"' ${config.out}/etc/zshenv - echo >&2 "checking nix-daemon init in /etc/zshenv" - grep '! -w /nix/var/nix/db' ${config.out}/etc/zshenv - grep 'export NIX_REMOTE=daemon' ${config.out}/etc/zshenv echo >&2 "checking nix-shell return /etc/zshenv" grep 'if test -n "$IN_NIX_SHELL"; then return; fi' ${config.out}/etc/zshenv echo >&2 "checking zshenv.d in /etc/zshenv" diff --git a/tests/services-nix-daemon.nix b/tests/services-nix-daemon.nix index a03d6a5..115ff44 100644 --- a/tests/services-nix-daemon.nix +++ b/tests/services-nix-daemon.nix @@ -1,13 +1,15 @@ { config, pkgs, ... }: let - nix = pkgs.runCommand "nix-0.0.0" {} "mkdir -p $out"; + nix = pkgs.runCommand "nix-0.0.0" { version = "1.11.6"; } "mkdir -p $out"; in { services.nix-daemon.enable = true; nix.package = nix; + programs.zsh.enable = true; + test = '' echo checking nix-daemon service in /Library/LaunchDaemons >&2 grep "<string>org.nixos.nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist @@ -20,5 +22,7 @@ in echo checking NIX_REMOTE=daemon in /etc/bashrc >&2 grep "NIX_REMOTE=daemon" ${config.out}/etc/bashrc + echo "checking NIX_REMOTE=daemon in /etc/zshenv" >&2 + grep 'export NIX_REMOTE=daemon' ${config.out}/etc/zshenv ''; } |