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] 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',