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

Revert "Merge pull request #11826 from DeterminateSystems/revert-11804"

Browse source 
This reverts commit aeffdeffc8, reversing
changes made to 723fdeb4f1.
This commit is contained in:
Eelco Dolstra 2024-11-11 15:21:34 +01:00
parent fa4bd39c6a
commit f29e7867a9
134 changed files with 75 additions and 4722 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/functional/common/functions.sh
View file

@ -343,15 +343,6 @@ count() {
echo $#
}
# Sometimes, e.g. due to pure eval, restricted eval, or sandboxing, we
# cannot look up `config.nix` in the build dir, and have to instead get
# it from the current directory. (In this case, the current directly
# will be somewhere in `$TEST_ROOT`.)
removeBuildDirRef() {
# shellcheck disable=SC2016 # The ${} in this is Nix, not shell
sed -i -e 's,"${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/[^ ]*config.nix",./config.nix,' "$@"
}
trap onError ERR
fi # COMMON_FUNCTIONS_SH_SOURCED