diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index 92c6b69e5fcb..6d879ce43292 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -10,10 +10,10 @@ let lua: { name, command }: pkgs.runCommandLocal "test-${lua.name}-${name}" - ({ + { nativeBuildInputs = [ lua ]; meta.platforms = lua.meta.platforms; - }) + } ( '' source ${./assert.sh} @@ -58,7 +58,7 @@ let ";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;"; }; in -pkgs.recurseIntoAttrs ({ +pkgs.recurseIntoAttrs { checkInterpreterPatch = let @@ -75,12 +75,12 @@ pkgs.recurseIntoAttrs ({ checkWrapping = pkgs.runCommandLocal "test-${lua.name}-wrapping" - ({ - }) - ('' + { + } + '' grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello touch $out - ''); + ''; # checks that lua's setup-hook adds dependencies to LUA_PATH # Prevents the following regressions @@ -90,21 +90,21 @@ pkgs.recurseIntoAttrs ({ # stdin:1: module 'http.request' not found: checkSetupHook = pkgs.runCommandLocal "test-${lua.name}-setup-hook" - ({ + { nativeBuildInputs = [ lua ]; buildInputs = [ lua.pkgs.http ]; meta.platforms = lua.meta.platforms; - }) - ('' + } + '' ${lua}/bin/lua -e "require'http.request'" touch $out - ''); + ''; checkRelativeImports = pkgs.runCommandLocal "test-${lua.name}-relative-imports" - ({ - }) - ('' + { + } + '' source ${./assert.sh} lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")" @@ -117,20 +117,18 @@ pkgs.recurseIntoAttrs ({ assertStringContains "$lua_with_module_package_path" "./?/init.lua" touch $out - ''); + ''; # Check that a lua package's propagatedBuildInputs end up in LUA_PATH checkPropagatedBuildInputs = pkgs.runCommandLocal "test-${lua.name}-setup-hook" - ({ + { buildInputs = [ lua.pkgs.rest-nvim ]; - }) + } # `xml2lua` is a propagatedBuildInput of rest-nvim - ( - '' - ${lua}/bin/lua -e "require'xml2lua'" - touch $out - '' - ); + '' + ${lua}/bin/lua -e "require'xml2lua'" + touch $out + ''; -}) +}