From 9a687953146dcb7749e7d283ddc9741bfff5b5c2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 28 Nov 2024 16:15:46 +0200 Subject: [PATCH] sile: 0.15.6 -> 0.15.7 Diff: https://github.com/sile-typesetter/sile/compare/None...v0.15.7 Changelog: https://github.com/sile-typesetter/sile/raw/v0.15.7/CHANGELOG.md --- pkgs/by-name/si/sile/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 5f830c0614a2..20a14a34bda3 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -10,6 +10,7 @@ cargo, rustc, rustPlatform, + luarocks, # buildInputs lua, @@ -30,18 +31,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.15.6"; + version = "0.15.7"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst"; - sha256 = "sha256-CtPvxbpq2/qwuANPp9XDJQHlxIbFiaNZJvYZeUx/wyE="; + sha256 = "sha256-PjU6Qfn+FTL3vt66mkIAn/uXWMPPlH8iK6B264ekIis="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; nativeBuildInputs = [ zstd ]; dontConfigure = true; - hash = "sha256-5SheeabI4SqJZ3edAvX2rUEGTdCXHoBTa+rnX7lv9Cg="; + hash = "sha256-m21SyGtHwVCz+77pYq48Gjnrf/TLCLCf/IQ7AnZk+fo="; }; nativeBuildInputs = [ @@ -51,7 +52,10 @@ stdenv.mkDerivation (finalAttrs: { cargo rustc rustPlatform.cargoSetupHook + luarocks ]; + # luarocks propagates cmake, but it shouldn't be used as a build system. + dontUseCmakeConfigure = true; buildInputs = [ finalAttrs.finalPackage.passthru.luaEnv