diff --git a/codedown.nix b/codedown.nix index b2f1f40..3bbb6b7 100644 --- a/codedown.nix +++ b/codedown.nix @@ -23,7 +23,7 @@ rec { # Exported so clients can build searchers for other package sets, like "codedown.searcher nixpkgs" searcher = common.searcher; - settingsSchemas = lib.mapAttrs (attr: value: value.meta.settingsSchema or []) languages; + settingsSchemas = lib.mapAttrs (attr: value: value.meta.settingsSchema or []) kernels; evaluateConfig = callPackage ./nix/evaluate-config.nix { inherit pkgsStable pkgsMaster; @@ -52,7 +52,7 @@ rec { ; }; - languages = everythingEnv.config.builtKernels; + kernels = everythingEnv.config.builtKernels; makeEnvironment = callPackage ./nix/makeEnvironment.nix { inherit pkgsStable pkgsMaster; diff --git a/flake.nix b/flake.nix index 922c559..2e9da02 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ # inherit codedown; # Tests use flake to do packageSearch builds - inherit (codedown) languages; + inherit (codedown) kernels; # For .envrc nixpkgsPath = pkgsStable.writeShellScriptBin "nixpkgsPath.sh" "echo -n ${pkgsStable.path}"; diff --git a/tests/src/TestLib/TestSearchers.hs b/tests/src/TestLib/TestSearchers.hs index 7f5fdd7..39c2fcc 100644 --- a/tests/src/TestLib/TestSearchers.hs +++ b/tests/src/TestLib/TestSearchers.hs @@ -29,20 +29,20 @@ testKernelSearchersBuild :: ( HasBaseContext context, MonadIO m, MonadMask m, MonadUnliftIO m, MonadBaseControl IO m ) => Text -> SpecFree context m () testKernelSearchersBuild kernel = it [i|#{kernel}: package searchers build|] $ do - testBuild [i|.\#languages."#{kernel}".packageSearch|] + testBuild [i|.\#kernels."#{kernel}".packageSearch|] testHasExpectedFields :: ( HasBaseContext context, MonadIO m, MonadMask m, MonadUnliftIO m, MonadBaseControl IO m ) => Text -> SpecFree context m () testHasExpectedFields kernel = it [i|#{kernel}: has expected fields|] $ do - testEval [i|.\#languages."#{kernel}".settingsSchema|] - testEval [i|.\#languages."#{kernel}".modes|] - testEval [i|.\#languages."#{kernel}".settings|] - testEval [i|.\#languages."#{kernel}".args|] - testEval [i|.\#languages."#{kernel}".meta|] + testEval [i|.\#kernels."#{kernel}".settingsSchema|] + testEval [i|.\#kernels."#{kernel}".modes|] + testEval [i|.\#kernels."#{kernel}".settings|] + testEval [i|.\#kernels."#{kernel}".args|] + testEval [i|.\#kernels."#{kernel}".meta|] -- Used to view all versions in codedown-languages - testEval [i|.\#languages."#{kernel}".versions|] + testEval [i|.\#kernels."#{kernel}".versions|] -- Testing for nonempty results @@ -56,7 +56,7 @@ testKernelSearchersNonempty kernel = describe [i|#{kernel}: package and LSP sear testPackageSearchNonempty :: ( HasBaseContext context, MonadIO m, MonadMask m, MonadUnliftIO m, MonadBaseControl IO m ) => Text -> ExampleT context m () -testPackageSearchNonempty kernel = testSearcherHasNonemptyResults [i|.\#languages."#{kernel}".packageSearch|] +testPackageSearchNonempty kernel = testSearcherHasNonemptyResults [i|.\#kernels."#{kernel}".packageSearch|] testSearcherHasNonemptyResults :: (MonadUnliftIO m, MonadThrow m, MonadLogger m, MonadFail m) => String -> m () testSearcherHasNonemptyResults expr = searcherResults expr >>= \case