From fdd2c6f80f787ec818021a2d9d5fd423ce848512 Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 28 Nov 2024 21:01:51 +0000 Subject: [PATCH] lib/tests: move `packages-from-directory/*` into a subdir in preparation for adding more tests for `lib.packagesFromDirectoryRecursive` --- lib/tests/misc.nix | 4 ++-- lib/tests/packages-from-directory/{ => plain}/a.nix | 0 lib/tests/packages-from-directory/{ => plain}/b.nix | 0 .../{ => plain}/c/my-extra-feature.patch | 0 .../{ => plain}/c/not-a-namespace/not-a-package.nix | 0 lib/tests/packages-from-directory/{ => plain}/c/package.nix | 0 .../{ => plain}/c/support-definitions.nix | 0 .../packages-from-directory/{ => plain}/my-namespace/d.nix | 0 .../packages-from-directory/{ => plain}/my-namespace/e.nix | 0 .../{ => plain}/my-namespace/f/package.nix | 0 .../{ => plain}/my-namespace/my-sub-namespace/g.nix | 0 .../{ => plain}/my-namespace/my-sub-namespace/h.nix | 0 12 files changed, 2 insertions(+), 2 deletions(-) rename lib/tests/packages-from-directory/{ => plain}/a.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/b.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/c/my-extra-feature.patch (100%) rename lib/tests/packages-from-directory/{ => plain}/c/not-a-namespace/not-a-package.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/c/package.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/c/support-definitions.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/my-namespace/d.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/my-namespace/e.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/my-namespace/f/package.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/my-namespace/my-sub-namespace/g.nix (100%) rename lib/tests/packages-from-directory/{ => plain}/my-namespace/my-sub-namespace/h.nix (100%) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index fde2d44e3efe..27c80ed0b48b 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -2617,7 +2617,7 @@ runTests { testPackagesFromDirectoryRecursive = { expr = packagesFromDirectoryRecursive { callPackage = path: overrides: import path overrides; - directory = ./packages-from-directory; + directory = ./packages-from-directory/plain; }; expected = { a = "a"; @@ -2642,7 +2642,7 @@ runTests { testPackagesFromDirectoryRecursiveTopLevelPackageNix = { expr = packagesFromDirectoryRecursive { callPackage = path: overrides: import path overrides; - directory = ./packages-from-directory/c; + directory = ./packages-from-directory/plain/c; }; expected = "c"; }; diff --git a/lib/tests/packages-from-directory/a.nix b/lib/tests/packages-from-directory/plain/a.nix similarity index 100% rename from lib/tests/packages-from-directory/a.nix rename to lib/tests/packages-from-directory/plain/a.nix diff --git a/lib/tests/packages-from-directory/b.nix b/lib/tests/packages-from-directory/plain/b.nix similarity index 100% rename from lib/tests/packages-from-directory/b.nix rename to lib/tests/packages-from-directory/plain/b.nix diff --git a/lib/tests/packages-from-directory/c/my-extra-feature.patch b/lib/tests/packages-from-directory/plain/c/my-extra-feature.patch similarity index 100% rename from lib/tests/packages-from-directory/c/my-extra-feature.patch rename to lib/tests/packages-from-directory/plain/c/my-extra-feature.patch diff --git a/lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix b/lib/tests/packages-from-directory/plain/c/not-a-namespace/not-a-package.nix similarity index 100% rename from lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix rename to lib/tests/packages-from-directory/plain/c/not-a-namespace/not-a-package.nix diff --git a/lib/tests/packages-from-directory/c/package.nix b/lib/tests/packages-from-directory/plain/c/package.nix similarity index 100% rename from lib/tests/packages-from-directory/c/package.nix rename to lib/tests/packages-from-directory/plain/c/package.nix diff --git a/lib/tests/packages-from-directory/c/support-definitions.nix b/lib/tests/packages-from-directory/plain/c/support-definitions.nix similarity index 100% rename from lib/tests/packages-from-directory/c/support-definitions.nix rename to lib/tests/packages-from-directory/plain/c/support-definitions.nix diff --git a/lib/tests/packages-from-directory/my-namespace/d.nix b/lib/tests/packages-from-directory/plain/my-namespace/d.nix similarity index 100% rename from lib/tests/packages-from-directory/my-namespace/d.nix rename to lib/tests/packages-from-directory/plain/my-namespace/d.nix diff --git a/lib/tests/packages-from-directory/my-namespace/e.nix b/lib/tests/packages-from-directory/plain/my-namespace/e.nix similarity index 100% rename from lib/tests/packages-from-directory/my-namespace/e.nix rename to lib/tests/packages-from-directory/plain/my-namespace/e.nix diff --git a/lib/tests/packages-from-directory/my-namespace/f/package.nix b/lib/tests/packages-from-directory/plain/my-namespace/f/package.nix similarity index 100% rename from lib/tests/packages-from-directory/my-namespace/f/package.nix rename to lib/tests/packages-from-directory/plain/my-namespace/f/package.nix diff --git a/lib/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix b/lib/tests/packages-from-directory/plain/my-namespace/my-sub-namespace/g.nix similarity index 100% rename from lib/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix rename to lib/tests/packages-from-directory/plain/my-namespace/my-sub-namespace/g.nix diff --git a/lib/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix b/lib/tests/packages-from-directory/plain/my-namespace/my-sub-namespace/h.nix similarity index 100% rename from lib/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix rename to lib/tests/packages-from-directory/plain/my-namespace/my-sub-namespace/h.nix