diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-10-09T17·21+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-10-09T22·00+0200 |
| commit | f66108f738b43bf822b06d7ab62c0b7129fb454c (patch) | |
| tree | f91a15c48c82d146e36de0b1fc727de44b5dc837 /tests | |
| parent | 2070d55b0b3c39cc2e8b7ce3eb13567c92bd5433 (diff) | |
nix-env: Create ~/.nix-profile automatically
(cherry picked from commit 9348f9291e5d9e4ba3c4347ea1b235640f54fd79)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/nix-channel.sh | 4 | ||||
| -rw-r--r-- | tests/nix-profile.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/nix-channel.sh b/tests/nix-channel.sh index 55f1695c4412..93f837befcec 100644 --- a/tests/nix-channel.sh +++ b/tests/nix-channel.sh @@ -36,7 +36,7 @@ grep -q 'item.*attrPath="foo".*name="dependencies"' $TEST_ROOT/meta.xml # Do an install. nix-env -i dependencies -[ -e $TEST_ROOT/var/nix/profiles/default/foobar ] +[ -e $TEST_HOME/.nix-profile/foobar ] clearProfiles rm -f $TEST_HOME/.nix-channels @@ -55,5 +55,5 @@ grep -q 'item.*attrPath="foo".*name="dependencies"' $TEST_ROOT/meta.xml # Do an install. nix-env -i dependencies -[ -e $TEST_ROOT/var/nix/profiles/default/foobar ] +[ -e $TEST_HOME/.nix-profile/foobar ] diff --git a/tests/nix-profile.sh b/tests/nix-profile.sh index b808cf1b4632..e2e0d1090804 100644 --- a/tests/nix-profile.sh +++ b/tests/nix-profile.sh @@ -7,5 +7,3 @@ rm -rf $TEST_HOME $TEST_ROOT/profile-var mkdir -p $TEST_HOME USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh; set" USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh" # test idempotency - -[ -L $TEST_HOME/.nix-profile ] |