Merge pull request #167947 from MatthewCroughan/mc/callLocklessFlake

lib: add callLocklessFlake

3 files changed, 22 insertions, 0 deletions

diff --git a/lib/tests/flakes/subflakeTest/flake.nix b/lib/tests/flakes/subflakeTest/flake.nix
new file mode 100644
index 0000000000000..3a8edd5e8c508
--- /dev/null
+++ b/lib/tests/flakes/subflakeTest/flake.nix
@@ -0,0 +1,8 @@
+{
+  outputs = { self, subflake, callLocklessFlake }: rec {
+    x = (callLocklessFlake {
+      path = subflake;
+      inputs = {};
+    }).subflakeOutput;
+  };
+}
diff --git a/lib/tests/flakes/subflakeTest/subflake/flake.nix b/lib/tests/flakes/subflakeTest/subflake/flake.nix
new file mode 100644
index 0000000000000..41566b52090cc
--- /dev/null
+++ b/lib/tests/flakes/subflakeTest/subflake/flake.nix
@@ -0,0 +1,5 @@
+{
+  outputs = { self }: {
+    subflakeOutput = 1;
+  };
+}
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index c5d1d431677ad..f7e62a71eee13 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -22,6 +22,15 @@ in
 
 runTests {
 
+# FLAKES
+
+  testCallLocklessFlake = {
+    expr = callLocklessFlake {
+      path = ./flakes/subflakeTest;
+      inputs = { subflake = ./flakes/subflakeTest/subflake; inherit callLocklessFlake; };
+    };
+    expected = { x = 1; outPath = ./flakes/subflakeTest; };
+  };
 
 # TRIVIAL