diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03 00:16:29 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03 00:16:29 +0000 |
| commit | 48cea0d01ef48733ab38a73a20611f63aeb1b5cc (patch) | |
| tree | fec81ee5b47b14d6a58ee0b0e86458072efbda4a /tests/user-envs.sh | |
| parent | 93e71e6ab68d9662441289a02448c47069beeb2a (diff) | |
* Refactoring: Get rid of a few subdirectories in corepkgs/, and some
other simplifications.
* Use <nix/...> to locate the corepkgs. This allows them to be
overriden through $NIX_PATH.
* Use bash's pipefail option in the NAR builder so that we don't need
to create a temporary file.
Diffstat (limited to 'tests/user-envs.sh')
| -rw-r--r-- | tests/user-envs.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/user-envs.sh b/tests/user-envs.sh index 5037e28b9..2bc9bee50 100644 --- a/tests/user-envs.sh +++ b/tests/user-envs.sh @@ -36,7 +36,7 @@ nix-env -p $profiles/test -q '*' | grep -q foo-2.0pre1 test "$($profiles/test/bin/foo)" = "foo-2.0pre1" # Upgrade "foo": should install foo-2.0. -NIX_PATH=nixpkgs=./user-envs.nix nix-env -p $profiles/test -f '<nixpkgs>' -u foo +NIX_PATH=nixpkgs=./user-envs.nix:$NIX_PATH nix-env -p $profiles/test -f '<nixpkgs>' -u foo # Query installed: should contain foo-2.0 now. test "$(nix-env -p $profiles/test -q '*' | wc -l)" -eq 1 |