From a0eccde52547f55be8edf2552f9f3b98fa90f724 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 7 Jan 2026 12:24:47 +0800 Subject: [PATCH 1/3] lla: do not vendor oniguruma --- pkgs/by-name/ll/lla/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 52eebe83fa9f..454a3d61c519 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, makeBinaryWrapper, installShellFiles, + pkg-config, + oniguruma, versionCheckHook, nix-update-script, }: @@ -24,8 +26,16 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ makeBinaryWrapper installShellFiles + pkg-config ]; + buildInputs = [ + oniguruma + ]; + + # Do not vendor Oniguruma + env.RUSTONIG_SYSTEM_LIBONIG = true; + cargoHash = "sha256-qKeNSaZMpyQpI7oGqn416pfBINMsIE+0sjzg38roxc8="; cargoBuildFlags = [ "--workspace" ]; From e257f8208e06c556099a4512c58df456d764cc59 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 7 Jan 2026 12:47:34 +0800 Subject: [PATCH 2/3] lla: use finalAttrs --- pkgs/by-name/ll/lla/package.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 454a3d61c519..faeae5e2a9af 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -9,17 +9,14 @@ versionCheckHook, nix-update-script, }: -let - version = "0.5.0"; -in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "lla"; - inherit version; + version = "0.5.0"; src = fetchFromGitHub { owner = "chaqchase"; repo = "lla"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xbXTiOr3c9PX0SRfjO+3Kib5S0fruFhjHO2Mf00BVBg="; }; @@ -65,10 +62,10 @@ rustPlatform.buildRustPackage { Git integration, and a robust plugin system with an extensible list of plugins to add more functionality. ''; homepage = "https://lla.chaqchase.com"; - changelog = "https://github.com/chaqchase/lla/blob/refs/tags/v${version}/CHANGELOG.md"; + changelog = "https://github.com/chaqchase/lla/blob/refs/tags/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ pluiedev ]; platforms = lib.platforms.unix; mainProgram = "lla"; }; -} +}) From d22281361bfcf03c41876dcd812dfbbd1ad1ef02 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 7 Jan 2026 12:49:50 +0800 Subject: [PATCH 3/3] lla: 0.5.0 -> 0.5.3 --- pkgs/by-name/ll/lla/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index faeae5e2a9af..53fd19056b66 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "lla"; - version = "0.5.0"; + version = "0.5.3"; src = fetchFromGitHub { owner = "chaqchase"; repo = "lla"; tag = "v${finalAttrs.version}"; - hash = "sha256-xbXTiOr3c9PX0SRfjO+3Kib5S0fruFhjHO2Mf00BVBg="; + hash = "sha256-AVvng3pF68bLlJBobEDBxW7/CQADTfg1Ylm/tjQFFfQ="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # Do not vendor Oniguruma env.RUSTONIG_SYSTEM_LIBONIG = true; - cargoHash = "sha256-qKeNSaZMpyQpI7oGqn416pfBINMsIE+0sjzg38roxc8="; + cargoHash = "sha256-SQBaUaNuPUUw/bQ9UnUNCo+HpU7VVK3wzKAtSDpmTHo="; cargoBuildFlags = [ "--workspace" ];