summary refs log tree commit diff
diff options
context:
space:
mode:
authormatthewcroughan <matt@croughan.sh>2022-04-12 20:38:55 +0100
committermatthewcroughan <matt@croughan.sh>2022-04-12 20:38:55 +0100
commitec59145c3b8d69bf1e270fdcfa651348880ad8e4 (patch)
tree1843615698c0b68613eb24087fea184c64d2bd83
parentcc052779fba0d9f0efa5980f42661798598b2ed1 (diff)
downloadnixpkgs-ec59145c3b8d69bf1e270fdcfa651348880ad8e4.tar
nixpkgs-ec59145c3b8d69bf1e270fdcfa651348880ad8e4.tar.gz
nixpkgs-ec59145c3b8d69bf1e270fdcfa651348880ad8e4.tar.bz2
nixpkgs-ec59145c3b8d69bf1e270fdcfa651348880ad8e4.tar.lz
nixpkgs-ec59145c3b8d69bf1e270fdcfa651348880ad8e4.tar.xz
nixpkgs-ec59145c3b8d69bf1e270fdcfa651348880ad8e4.tar.zst
nixpkgs-ec59145c3b8d69bf1e270fdcfa651348880ad8e4.zip
lib/tests: use subflake to test callLocklessFlake
-rw-r--r--lib/tests/flakes/subflakeTest/flake.nix8
-rw-r--r--lib/tests/flakes/subflakeTest/subflake/flake.nix5
-rw-r--r--lib/tests/misc.nix6
3 files changed, 16 insertions, 3 deletions
diff --git a/lib/tests/flakes/subflakeTest/flake.nix b/lib/tests/flakes/subflakeTest/flake.nix
new file mode 100644
index 00000000000..3dca262cace
--- /dev/null
+++ b/lib/tests/flakes/subflakeTest/flake.nix
@@ -0,0 +1,8 @@
+{
+  inputs = {
+    subflake.url = "path:subflake";
+  };
+  outputs = { self, subflake }: {
+    x = subflake;
+  };
+}
diff --git a/lib/tests/flakes/subflakeTest/subflake/flake.nix b/lib/tests/flakes/subflakeTest/subflake/flake.nix
new file mode 100644
index 00000000000..9ae32d72ef6
--- /dev/null
+++ b/lib/tests/flakes/subflakeTest/subflake/flake.nix
@@ -0,0 +1,5 @@
+{
+  outputs = { self }: {
+    y = 1;
+  };
+}
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 9ca1d7ca50c..e11fe648cc9 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -26,10 +26,10 @@ runTests {
 
   testCallLocklessFlake = {
     expr = callLocklessFlake {
-      path = ./..;
-      inputs = {};
+      path = ./flakes/subflakeTest;
+      inputs = { subflake = ./flakes/subflakeTest/subflake; };
     };
-    expected = { lib = import ./..; outPath = ./..; };
+    expected = { x = ./flakes/subflakeTest/subflake; outPath = ./flakes/subflakeTest; };
   };
 
 # TRIVIAL