From 161776ec1e35c565ff8543e7dac1f739115d1ec2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 15 May 2022 16:58:09 +1200 Subject: Revert "lib: init flakes.nix" This reverts commit PR #167947. Flakes aren't standardised and the `lib` namespace shouldn't be polluted with utilities that serve only experimental uses. --- lib/tests/flakes/subflakeTest/flake.nix | 8 -------- lib/tests/flakes/subflakeTest/subflake/flake.nix | 5 ----- lib/tests/misc.nix | 10 ---------- 3 files changed, 23 deletions(-) delete mode 100644 lib/tests/flakes/subflakeTest/flake.nix delete mode 100644 lib/tests/flakes/subflakeTest/subflake/flake.nix (limited to 'lib/tests') diff --git a/lib/tests/flakes/subflakeTest/flake.nix b/lib/tests/flakes/subflakeTest/flake.nix deleted file mode 100644 index 3a8edd5e8c508..0000000000000 --- a/lib/tests/flakes/subflakeTest/flake.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - 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 deleted file mode 100644 index 41566b52090cc..0000000000000 --- a/lib/tests/flakes/subflakeTest/subflake/flake.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - outputs = { self }: { - subflakeOutput = 1; - }; -} diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index c7010f41394a0..1154edf1de628 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -22,16 +22,6 @@ in runTests { -# FLAKES - - testCallLocklessFlake = { - expr = callLocklessFlake { - path = ./flakes/subflakeTest; - inputs = { subflake = ./flakes/subflakeTest/subflake; inherit callLocklessFlake; }; - }; - expected = { x = 1; outPath = ./flakes/subflakeTest; }; - }; - # TRIVIAL testId = { -- cgit 1.4.1