Make config.nix shims

As requested in https://github.com/NixOS/nix/pull/11792#discussion_r1827034428
2024-11-23 22:46:16 +02:00 · 2024-11-03 17:22:12 -05:00 · 2024-11-03 17:22:12 -05:00 · f7591bc6ed
commit f7591bc6ed
parent e70c9bb06a
56 changed files with 49 additions and 77 deletions
--- a/.gitignore
+++ b/.gitignore
@ -102,9 +102,6 @@ perl/Makefile.config
 /tests/functional/restricted-innocent
 /tests/functional/shell
 /tests/functional/shell.drv
-/tests/functional/config.nix
-/tests/functional/ca/config.nix
-/tests/functional/dyn-drv/config.nix
 /tests/functional/repl-result-out
 /tests/functional/debugger-test-out
 /tests/functional/test-libstoreconsumer/test-libstoreconsumer
--- a/tests/functional/build-hook-ca-fixed.nix
+++ b/tests/functional/build-hook-ca-fixed.nix
@ -1,6 +1,6 @@
 { busybox }:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 let

--- a/tests/functional/build-hook.nix
+++ b/tests/functional/build-hook.nix
@ -1,6 +1,6 @@
 { busybox, contentAddressed ? false }:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 let

--- a/tests/functional/ca/config.nix
+++ b/tests/functional/ca/config.nix
@ -0,0 +1,2 @@
+# Shim to get generated file
+import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/ca/config.nix"
--- a/tests/functional/ca/content-addressed.nix
+++ b/tests/functional/ca/content-addressed.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/ca/config.nix";
+with import ./config.nix;

 let mkCADerivation = args: mkDerivation ({
    __contentAddressed = true;
--- a/tests/functional/ca/nix-run.sh
+++ b/tests/functional/ca/nix-run.sh
@ -6,7 +6,4 @@ flakeDir="$TEST_HOME/flake"
 mkdir -p "${flakeDir}"
 cp flake.nix "${_NIX_TEST_BUILD_DIR}/ca/config.nix" content-addressed.nix "${flakeDir}"

-# `config.nix` cannot be gotten via build dir / env var (runs afoul pure eval). Instead get from flake.
-removeBuildDirRef "$flakeDir"/*.nix
-
 nix run --no-write-lock-file "path:${flakeDir}#runnable"
--- a/tests/functional/ca/nondeterministic.nix
+++ b/tests/functional/ca/nondeterministic.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/ca/config.nix";
+with import ./config.nix;

 let mkCADerivation = args: mkDerivation ({
    __contentAddressed = true;
--- a/tests/functional/ca/racy.nix
+++ b/tests/functional/ca/racy.nix
@ -2,7 +2,7 @@
 # build it at once.


-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/ca/config.nix";
+with import ./config.nix;

 mkDerivation {
  name = "simple";
--- a/tests/functional/check-refs.nix
+++ b/tests/functional/check-refs.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {

--- a/tests/functional/check-reqs.nix
+++ b/tests/functional/check-reqs.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {
  dep1 = mkDerivation {
--- a/tests/functional/check.nix
+++ b/tests/functional/check.nix
@ -1,6 +1,6 @@
 {checkBuildId ? 0}:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 {
  nondeterministic = mkDerivation {
--- a/tests/functional/chroot-store.sh
+++ b/tests/functional/chroot-store.sh
@ -39,9 +39,6 @@ EOF

    cp simple.nix shell.nix simple.builder.sh "${config_nix}" "$flakeDir/"

-    # `config.nix` cannot be gotten via build dir / env var (runs afoul pure eval). Instead get from flake.
-    removeBuildDirRef "$flakeDir"/*.nix
-
    TODO_NixOS

    outPath=$(nix build --print-out-paths --no-link --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' --store "$TEST_ROOT/x" path:"$flakeDir")
--- a/tests/functional/common/functions.sh
+++ b/tests/functional/common/functions.sh
@ -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
--- a/tests/functional/config.nix
+++ b/tests/functional/config.nix
@ -0,0 +1,2 @@
+# Shim to get generated file
+import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix"
--- a/tests/functional/dependencies.nix
+++ b/tests/functional/dependencies.nix
@ -1,5 +1,5 @@
 { hashInvalidator ? "" }:
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 let {

--- a/tests/functional/dyn-drv/config.nix
+++ b/tests/functional/dyn-drv/config.nix
@ -0,0 +1,2 @@
+# Shim to get generated file
+import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/dyn-drv/config.nix"
--- a/tests/functional/dyn-drv/old-daemon-error-hack.nix
+++ b/tests/functional/dyn-drv/old-daemon-error-hack.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/dyn-drv/config.nix";
+with import ./config.nix;

 # A simple content-addressed derivation.
 # The derivation can be arbitrarily modified by passing a different `seed`,
--- a/tests/functional/dyn-drv/recursive-mod-json.nix
+++ b/tests/functional/dyn-drv/recursive-mod-json.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/dyn-drv/config.nix";
+with import ./config.nix;

 let innerName = "foo"; in

--- a/tests/functional/dyn-drv/text-hashed-output.nix
+++ b/tests/functional/dyn-drv/text-hashed-output.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/dyn-drv/config.nix";
+with import ./config.nix;

 # A simple content-addressed derivation.
 # The derivation can be arbitrarily modified by passing a different `seed`,
--- a/tests/functional/export-graph.nix
+++ b/tests/functional/export-graph.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {

--- a/tests/functional/extra-sandbox-profile.nix
+++ b/tests/functional/extra-sandbox-profile.nix
@ -1,6 +1,6 @@
 { destFile, seed }:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 mkDerivation {
  name = "simple";
--- a/tests/functional/failing.nix
+++ b/tests/functional/failing.nix
@ -1,5 +1,5 @@
 { busybox }:
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;
 let

  mkDerivation = args:
--- a/tests/functional/filter-source.nix
+++ b/tests/functional/filter-source.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 mkDerivation {
  name = "filter";
--- a/tests/functional/fixed.nix
+++ b/tests/functional/fixed.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {

--- a/tests/functional/flakes/bundle.sh
+++ b/tests/functional/flakes/bundle.sh
@ -4,9 +4,6 @@ source common.sh

 cp ../simple.nix ../simple.builder.sh "${config_nix}" "$TEST_HOME"

-# `config.nix` cannot be gotten via build dir / env var (runs afoul pure eval). Instead get from flake.
-removeBuildDirRef "$TEST_HOME"/*.nix
-
 cd "$TEST_HOME"

 cat <<EOF > flake.nix
--- a/tests/functional/flakes/common.sh
+++ b/tests/functional/flakes/common.sh
@ -35,9 +35,6 @@ writeSimpleFlake() {
 EOF

    cp ../simple.nix ../shell.nix ../simple.builder.sh "${config_nix}" "$flakeDir/"
-
-    # `config.nix` cannot be gotten via build dir / env var (runs afoul pure eval). Instead get from flake.
-    removeBuildDirRef "$flakeDir"/*.nix
 }

 createSimpleGitFlake() {
--- a/tests/functional/flakes/config.sh
+++ b/tests/functional/flakes/config.sh
@ -3,7 +3,6 @@
 source common.sh

 cp ../simple.nix ../simple.builder.sh "${config_nix}" $TEST_HOME
-removeBuildDirRef "$TEST_HOME/simple.nix"

 cd $TEST_HOME

--- a/tests/functional/flakes/develop.sh
+++ b/tests/functional/flakes/develop.sh
@ -27,9 +27,6 @@ EOF
 mkdir -p "$TEST_HOME/nixpkgs"
 cp "${config_nix}" ../shell.nix "$TEST_HOME/nixpkgs"

-# `config.nix` cannot be gotten via build dir / env var (runs afoul pure eval). Instead get from flake.
-removeBuildDirRef "$TEST_HOME/nixpkgs"/*.nix
-
 cat <<EOF >"$TEST_HOME/nixpkgs/flake.nix"
 {
    outputs = {self}: {
--- a/tests/functional/flakes/run.sh
+++ b/tests/functional/flakes/run.sh
@ -8,8 +8,6 @@ clearStore
 rm -rf $TEST_HOME/.cache $TEST_HOME/.config $TEST_HOME/.local

 cp ../shell-hello.nix "${config_nix}" $TEST_HOME
-# `config.nix` cannot be gotten via build dir / env var (runs afoul pure eval). Instead get from flake.
-removeBuildDirRef "$TEST_HOME"/*.nix
 cd $TEST_HOME

 cat <<EOF > flake.nix
--- a/tests/functional/fod-failing.nix
+++ b/tests/functional/fod-failing.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;
 rec {
  x1 = mkDerivation {
    name = "x1";
--- a/tests/functional/gc-concurrent.nix
+++ b/tests/functional/gc-concurrent.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 { lockFifo ? null }:

--- a/tests/functional/gc-runtime.nix
+++ b/tests/functional/gc-runtime.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 mkDerivation {
  name = "gc-runtime";
--- a/tests/functional/hermetic.nix
+++ b/tests/functional/hermetic.nix
@ -5,7 +5,7 @@
 , withFinalRefs ? false
 }:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 let
  contentAddressedByDefault = builtins.getEnv "NIX_TESTS_CA_BY_DEFAULT" == "1";
--- a/tests/functional/ifd.nix
+++ b/tests/functional/ifd.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;
 import (
  mkDerivation {
    name = "foo";
--- a/tests/functional/import-from-derivation.nix
+++ b/tests/functional/import-from-derivation.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {
  bar = mkDerivation {
--- a/tests/functional/impure-derivations.nix
+++ b/tests/functional/impure-derivations.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {

--- a/tests/functional/impure-env.nix
+++ b/tests/functional/impure-env.nix
@ -1,6 +1,6 @@
 { var, value }:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 mkDerivation {
  name = "test";
--- a/tests/functional/linux-sandbox-cert-test.nix
+++ b/tests/functional/linux-sandbox-cert-test.nix
@ -1,6 +1,6 @@
 { mode }:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 mkDerivation (
  {
--- a/tests/functional/multiple-outputs.nix
+++ b/tests/functional/multiple-outputs.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {

--- a/tests/functional/nar-access.nix
+++ b/tests/functional/nar-access.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {
    a = mkDerivation {
--- a/tests/functional/nix-build-examples.nix
+++ b/tests/functional/nix-build-examples.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {

--- a/tests/functional/parallel.nix
+++ b/tests/functional/parallel.nix
@ -1,6 +1,6 @@
 {sleepTime ? 3}:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 let

--- a/tests/functional/path.nix
+++ b/tests/functional/path.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 mkDerivation {
  name = "filter";
--- a/tests/functional/readfile-context.nix
+++ b/tests/functional/readfile-context.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 let

--- a/tests/functional/restricted.sh
+++ b/tests/functional/restricted.sh
@ -12,10 +12,6 @@ mkdir -p "$TEST_ROOT/nix"
 cp ./simple.nix "$TEST_ROOT/nix"
 cp ./simple.builder.sh "$TEST_ROOT/nix"
 cp "${config_nix}" "$TEST_ROOT/nix"
-simple_nix="$TEST_ROOT/nix/simple.nix"
-# N.B. redefine
-config_nix="$TEST_ROOT/nix/config.nix"
-removeBuildDirRef "${simple_nix}"
 cd "$TEST_ROOT/nix"

 nix-instantiate --restrict-eval ./simple.nix -I src=.
--- a/tests/functional/search.nix
+++ b/tests/functional/search.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 {
  hello = mkDerivation rec {
--- a/tests/functional/secure-drv-outputs.nix
+++ b/tests/functional/secure-drv-outputs.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 {

--- a/tests/functional/shell-hello.nix
+++ b/tests/functional/shell-hello.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 rec {
  hello = mkDerivation {
--- a/tests/functional/shell.nix
+++ b/tests/functional/shell.nix
@ -1,6 +1,6 @@
 { inNixShell ? false, contentAddressed ? false, fooContents ? "foo" }:

-let cfg = import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix"; in
+let cfg = import ./config.nix; in
 with cfg;

 let
--- a/tests/functional/simple-failing.nix
+++ b/tests/functional/simple-failing.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 mkDerivation {
  name = "simple-failing";
--- a/tests/functional/simple.nix
+++ b/tests/functional/simple.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 mkDerivation {
  name = "simple";
--- a/tests/functional/structured-attrs-shell.nix
+++ b/tests/functional/structured-attrs-shell.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;
 let
  dep = mkDerivation {
    name = "dep";
--- a/tests/functional/structured-attrs.nix
+++ b/tests/functional/structured-attrs.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 let

--- a/tests/functional/symlink-derivation.nix
+++ b/tests/functional/symlink-derivation.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 let
  foo_in_store = builtins.toFile "foo" "foo";
--- a/tests/functional/timeout.nix
+++ b/tests/functional/timeout.nix
@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 {

--- a/tests/functional/user-envs.nix
+++ b/tests/functional/user-envs.nix
@ -2,7 +2,7 @@
 { foo ? "foo"
 }:

-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
+with import ./config.nix;

 assert foo == "foo";