wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 14:21:48 +02:00
Code Activity

Merge remote-tracking branch 'upstream/master' into libgit2

Browse source
This commit is contained in:
John Ericson 2023-11-20 08:29:27 -05:00
commit 4ab27e5595
67 changed files with 1356 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/functional/add.sh
View file

@ -26,3 +26,20 @@ hash2=$(nix-hash --type sha256 --base32 ./dummy)
echo $hash2
test "$hash1" = "sha256:$hash2"
#### New style commands
clearStore
(
path1=$(nix store add ./dummy)
path2=$(nix store add --mode nar ./dummy)
path3=$(nix store add-path ./dummy)
[[ "$path1" == "$path2" ]]
[[ "$path1" == "$path3" ]]
)
(
path1=$(nix store add --mode flat ./dummy)
path2=$(nix store add-file ./dummy)
[[ "$path1" == "$path2" ]]
)

2
tests/functional/common/vars-and-functions.sh.in
View file

@ -4,7 +4,7 @@ if [[ -z "${COMMON_VARS_AND_FUNCTIONS_SH_SOURCED-}" ]]; then
COMMON_VARS_AND_FUNCTIONS_SH_SOURCED=1
export PS4='+(${BASH_SOURCE[0]-$0}:$LINENO) '
set +x
export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test)/${TEST_NAME:-default/tests\/functional//}
export NIX_STORE_DIR

1
tests/functional/lang/eval-okay-symlink-resolution.exp Normal file
View file

@ -0,0 +1 @@
"test"

1
tests/functional/lang/eval-okay-symlink-resolution.nix Normal file
View file

@ -0,0 +1 @@
import symlink-resolution/foo/overlays/overlay.nix

1
tests/functional/lang/symlink-resolution/foo/lib/default.nix Normal file
View file

@ -0,0 +1 @@
"test"

1
tests/functional/lang/symlink-resolution/foo/overlays Symbolic link
View file

@ -0,0 +1 @@
../overlays

1
tests/functional/lang/symlink-resolution/overlays/overlay.nix Normal file
View file

@ -0,0 +1 @@
import ../lib