diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 65524316c8d2..c5b2babef5eb 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -6,7 +6,7 @@ lib, libgit2, libgpg-error, - luajit, + lua5_4, makeWrapper, nix, openssl, @@ -17,18 +17,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.13.3"; + version = "0.15.1"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-RmdxqpmqOs/1a9KmakWAHJUkiQ6I2t4VROiSocRnx84="; + hash = "sha256-1u0zDGUytuMhqe7NOJeXd1DKch8P7FT02MYgMkX3eMc="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-vin86rAmUbHJJuhChZi3ndj57wTCv945sVF6+by6Dlc="; + cargoHash = "sha256-C84VZfpMua1RrFhTFhWfY2xZAPDtNllkAbdHljlYdZs="; nativeInstallCheckInputs = [ versionCheckHook @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { gpgme libgit2 libgpg-error - luajit + lua5_4 openssl ]; @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = "--lib"; # Disable impure integration tests nativeCheckInputs = [ - luajit + lua5_4 nix ]; diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix index d2a1009fe513..09a0efd15cec 100644 --- a/pkgs/development/lua-modules/lux-lua.nix +++ b/pkgs/development/lua-modules/lux-lua.nix @@ -56,14 +56,17 @@ rustPlatform.buildRustPackage rec { LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests }; - postBuild = '' + buildPhase = '' + runHook preBuild cargo xtask-${luaFeature} dist + mkdir -p $out + runHook postBuild ''; installPhase = '' runHook preInstall - install -D -v target/dist/${luaVersionDir}/* -t $out/${luaVersionDir} - install -D -v target/dist/lib/pkgconfig/* -t $out/lib/pkgconfig + cp -r target/dist/share $out + cp -r target/dist/lib $out runHook postInstall '';