mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix nix-shell tests

Browse source 
The nix-shell fix in 668fef2e4f revealed
that we had some --pure tests that incorrectly depended on PATH from
config.nix's mkDerivation being overwritten by the caller's PATH.

http://hydra.nixos.org/build/49242478
This commit is contained in:
Eelco Dolstra 2017-02-24 17:25:22 +01:00
parent d3e1aad421
commit 89ffe1eff9
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/nix-shell.sh
View file

@ -4,6 +4,7 @@ clearStore
# Test nix-shell -A # Test nix-shell -A
export IMPURE_VAR=foo export IMPURE_VAR=foo
export NIX_BUILD_SHELL=$SHELL
output=$(nix-shell --pure shell.nix -A shellDrv --run \ output=$(nix-shell --pure shell.nix -A shellDrv --run \
'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"')

1
tests/shell.nix
View file

@ -34,6 +34,7 @@ rec {
mkdir -p $out/bin mkdir -p $out/bin
echo 'echo foo' > $out/bin/foo echo 'echo foo' > $out/bin/foo
chmod a+rx $out/bin/foo chmod a+rx $out/bin/foo
ln -s ${shell} $out/bin/bash
''; '';
bar = runCommand "bar" {} '' bar = runCommand "bar" {} ''