From ee3f0b7a8b40becb2c03d944a0f02169bb205cda Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 17 Sep 2024 16:55:44 +0200
Subject: [PATCH 1/4] Rename import-derivation -> import-from-derivation

---
 maintainers/flake-module.nix                                  | 2 +-
 .../ca/{import-derivation.sh => import-from-derivation.sh}    | 2 +-
 tests/functional/ca/local.mk                                  | 2 +-
 tests/functional/ca/meson.build                               | 2 +-
 .../{import-derivation.nix => import-from-derivation.nix}     | 0
 .../{import-derivation.sh => import-from-derivation.sh}       | 4 ++--
 tests/functional/local.mk                                     | 2 +-
 tests/functional/meson.build                                  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/functional/ca/{import-derivation.sh => import-from-derivation.sh} (55%)
 rename tests/functional/{import-derivation.nix => import-from-derivation.nix} (100%)
 rename tests/functional/{import-derivation.sh => import-from-derivation.sh} (58%)

diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index 0b83e5696..fb286208d 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -508,7 +508,7 @@
             ''^tests/functional/ca/concurrent-builds\.sh$''
             ''^tests/functional/ca/eval-store\.sh$''
             ''^tests/functional/ca/gc\.sh$''
-            ''^tests/functional/ca/import-derivation\.sh$''
+            ''^tests/functional/ca/import-from-derivation\.sh$''
             ''^tests/functional/ca/new-build-cmd\.sh$''
             ''^tests/functional/ca/nix-shell\.sh$''
             ''^tests/functional/ca/post-hook\.sh$''
diff --git a/tests/functional/ca/import-derivation.sh b/tests/functional/ca/import-from-derivation.sh
similarity index 55%
rename from tests/functional/ca/import-derivation.sh
rename to tests/functional/ca/import-from-derivation.sh
index e98e0fbd0..0713619a6 100644
--- a/tests/functional/ca/import-derivation.sh
+++ b/tests/functional/ca/import-from-derivation.sh
@@ -2,5 +2,5 @@ source common.sh
 
 export NIX_TESTS_CA_BY_DEFAULT=1
 
-cd .. && source import-derivation.sh
+cd .. && source import-from-derivation.sh
 
diff --git a/tests/functional/ca/local.mk b/tests/functional/ca/local.mk
index 4f86b268f..7c2fcc451 100644
--- a/tests/functional/ca/local.mk
+++ b/tests/functional/ca/local.mk
@@ -7,7 +7,7 @@ ca-tests := \
   $(d)/duplicate-realisation-in-closure.sh \
   $(d)/eval-store.sh \
   $(d)/gc.sh \
-  $(d)/import-derivation.sh \
+  $(d)/import-from-derivation.sh \
   $(d)/new-build-cmd.sh \
   $(d)/nix-copy.sh \
   $(d)/nix-run.sh \
diff --git a/tests/functional/ca/meson.build b/tests/functional/ca/meson.build
index f682ab28f..00cf8b35f 100644
--- a/tests/functional/ca/meson.build
+++ b/tests/functional/ca/meson.build
@@ -16,7 +16,7 @@ suites += {
     'duplicate-realisation-in-closure.sh',
     'eval-store.sh',
     'gc.sh',
-    'import-derivation.sh',
+    'import-from-derivation.sh',
     'new-build-cmd.sh',
     'nix-copy.sh',
     'nix-run.sh',
diff --git a/tests/functional/import-derivation.nix b/tests/functional/import-from-derivation.nix
similarity index 100%
rename from tests/functional/import-derivation.nix
rename to tests/functional/import-from-derivation.nix
diff --git a/tests/functional/import-derivation.sh b/tests/functional/import-from-derivation.sh
similarity index 58%
rename from tests/functional/import-derivation.sh
rename to tests/functional/import-from-derivation.sh
index 68ddcfa4a..dc6e80ed2 100755
--- a/tests/functional/import-derivation.sh
+++ b/tests/functional/import-from-derivation.sh
@@ -4,11 +4,11 @@ source common.sh
 
 clearStoreIfPossible
 
-if nix-instantiate --readonly-mode ./import-derivation.nix; then
+if nix-instantiate --readonly-mode ./import-from-derivation.nix; then
     echo "read-only evaluation of an imported derivation unexpectedly failed"
     exit 1
 fi
 
-outPath=$(nix-build ./import-derivation.nix --no-out-link)
+outPath=$(nix-build ./import-from-derivation.nix --no-out-link)
 
 [ "$(cat "$outPath")" = FOO579 ]
diff --git a/tests/functional/local.mk b/tests/functional/local.mk
index f61823765..3f796291a 100644
--- a/tests/functional/local.mk
+++ b/tests/functional/local.mk
@@ -88,7 +88,7 @@ nix_tests = \
   why-depends.sh \
   derivation-json.sh \
   derivation-advanced-attributes.sh \
-  import-derivation.sh \
+  import-from-derivation.sh \
   nix_path.sh \
   nars.sh \
   placeholders.sh \
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 5167fa814..69b6d3194 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -157,7 +157,7 @@ suites = [
       'why-depends.sh',
       'derivation-json.sh',
       'derivation-advanced-attributes.sh',
-      'import-derivation.sh',
+      'import-from-derivation.sh',
       'nix_path.sh',
       'nars.sh',
       'placeholders.sh',

From 8690b6f1381a17bbe8e838d874aa23c541b1cf52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 18 Sep 2024 12:42:20 +0200
Subject: [PATCH 2/4] Test IFD/filterSource in a chroot

Relevant to #11503.
---
 tests/functional/import-from-derivation.nix | 25 ++++++++++------
 tests/functional/import-from-derivation.sh  | 33 +++++++++++++++++++--
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/tests/functional/import-from-derivation.nix b/tests/functional/import-from-derivation.nix
index 44fa9a45d..cc53451cf 100644
--- a/tests/functional/import-from-derivation.nix
+++ b/tests/functional/import-from-derivation.nix
@@ -1,7 +1,6 @@
 with import ./config.nix;
 
-let
-
+rec {
   bar = mkDerivation {
     name = "bar";
     builder = builtins.toFile "builder.sh"
@@ -15,12 +14,20 @@ let
     assert builtins.pathExists bar;
     import bar;
 
-in
+  result = mkDerivation {
+    name = "foo";
+    builder = builtins.toFile "builder.sh"
+      ''
+        echo -n FOO${toString value} > $out
+      '';
+  };
 
-mkDerivation {
-  name = "foo";
-  builder = builtins.toFile "builder.sh"
-    ''
-      echo -n FOO${toString value} > $out
-    '';
+  addPath = mkDerivation {
+    name = "add-path";
+    src = builtins.filterSource (path: type: true) result;
+    builder = builtins.toFile "builder.sh"
+      ''
+        echo -n BLA$(cat $src) > $out
+      '';
+  };
 }
diff --git a/tests/functional/import-from-derivation.sh b/tests/functional/import-from-derivation.sh
index dc6e80ed2..de94bdd00 100755
--- a/tests/functional/import-from-derivation.sh
+++ b/tests/functional/import-from-derivation.sh
@@ -4,11 +4,40 @@ source common.sh
 
 clearStoreIfPossible
 
-if nix-instantiate --readonly-mode ./import-from-derivation.nix; then
+if nix-instantiate --readonly-mode ./import-from-derivation.nix -A result; then
     echo "read-only evaluation of an imported derivation unexpectedly failed"
     exit 1
 fi
 
-outPath=$(nix-build ./import-from-derivation.nix --no-out-link)
+outPath=$(nix-build ./import-from-derivation.nix -A result --no-out-link)
 
 [ "$(cat "$outPath")" = FOO579 ]
+
+# Test filterSource on the result of a derivation.
+outPath2=$(nix-build ./import-from-derivation.nix -A addPath --no-out-link)
+[[ "$(cat "$outPath2")" = BLAFOO579 ]]
+
+# Test that IFD works with a chroot store.
+if canUseSandbox; then
+
+    store2="$TEST_ROOT/store2"
+    store2_url="$store2?store=$NIX_STORE_DIR"
+
+    # Copy the derivation outputs to the chroot store to avoid having
+    # to actually build anything, as that would fail due to the lack
+    # of a shell in the sandbox. We only care about testing the IFD
+    # semantics.
+    for i in bar result addPath; do
+        nix copy --to "$store2_url" --no-check-sigs "$(nix-build ./import-from-derivation.nix -A $i --no-out-link)"
+    done
+
+    clearStore
+
+    outPath_check=$(nix-build ./import-from-derivation.nix -A result --no-out-link --store "$store2_url")
+    [[ "$outPath" = "$outPath_check" ]]
+    [[ ! -e "$outPath" ]]
+    [[ -e "$store2/nix/store/$(basename $outPath)" ]]
+
+    outPath2_check=$(nix-build ./import-from-derivation.nix -A addPath --no-out-link --store "$store2_url")
+    [[ "$outPath2" = "$outPath2_check" ]]
+fi

From d772a8b3dc41f689c052662778f488bef44ded49 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 18 Sep 2024 18:05:08 +0200
Subject: [PATCH 3/4] shellcheck

---
 tests/functional/import-from-derivation.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/import-from-derivation.sh b/tests/functional/import-from-derivation.sh
index de94bdd00..c5ed88a1d 100755
--- a/tests/functional/import-from-derivation.sh
+++ b/tests/functional/import-from-derivation.sh
@@ -28,7 +28,7 @@ if canUseSandbox; then
     # of a shell in the sandbox. We only care about testing the IFD
     # semantics.
     for i in bar result addPath; do
-        nix copy --to "$store2_url" --no-check-sigs "$(nix-build ./import-from-derivation.nix -A $i --no-out-link)"
+        nix copy --to "$store2_url" --no-check-sigs "$(nix-build ./import-from-derivation.nix -A "$i" --no-out-link)"
     done
 
     clearStore
@@ -36,7 +36,7 @@ if canUseSandbox; then
     outPath_check=$(nix-build ./import-from-derivation.nix -A result --no-out-link --store "$store2_url")
     [[ "$outPath" = "$outPath_check" ]]
     [[ ! -e "$outPath" ]]
-    [[ -e "$store2/nix/store/$(basename $outPath)" ]]
+    [[ -e "$store2/nix/store/$(basename "$outPath")" ]]
 
     outPath2_check=$(nix-build ./import-from-derivation.nix -A addPath --no-out-link --store "$store2_url")
     [[ "$outPath2" = "$outPath2_check" ]]

From a673084733885c2a4e3126b0eef2a2c1c19e5237 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 18 Sep 2024 19:06:48 +0200
Subject: [PATCH 4/4] Fix tests

---
 tests/functional/import-from-derivation.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/functional/import-from-derivation.sh b/tests/functional/import-from-derivation.sh
index c5ed88a1d..83ef92a6f 100755
--- a/tests/functional/import-from-derivation.sh
+++ b/tests/functional/import-from-derivation.sh
@@ -2,6 +2,8 @@
 
 source common.sh
 
+TODO_NixOS
+
 clearStoreIfPossible
 
 if nix-instantiate --readonly-mode ./import-from-derivation.nix -A result; then
@@ -13,6 +15,11 @@ outPath=$(nix-build ./import-from-derivation.nix -A result --no-out-link)
 
 [ "$(cat "$outPath")" = FOO579 ]
 
+# FIXME: the next tests are broken on CA.
+if [[ -n "${NIX_TESTS_CA_BY_DEFAULT:-}" ]]; then
+    exit 0
+fi
+
 # Test filterSource on the result of a derivation.
 outPath2=$(nix-build ./import-from-derivation.nix -A addPath --no-out-link)
 [[ "$(cat "$outPath2")" = BLAFOO579 ]]