From 69eecf184667d11d69fe0abefeb53028c4f6b098 Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 5 May 2026 18:18:22 +0700 Subject: [PATCH 1/2] lnx: switch to finalAttrs --- pkgs/by-name/ln/lnx/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ln/lnx/package.nix b/pkgs/by-name/ln/lnx/package.nix index 3bad721f2788..095c3b0fe60b 100644 --- a/pkgs/by-name/ln/lnx/package.nix +++ b/pkgs/by-name/ln/lnx/package.nix @@ -6,17 +6,15 @@ # unstable was chosen because of an added Cargo.lock # revert to stable for the version after 0.9.0 -let - version = "unstable-2022-06-25"; -in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "lnx"; - inherit version; + version = "unstable-2022-06-25"; + src = fetchFromGitHub { owner = "lnx-search"; repo = "lnx"; rev = "2cb80f344c558bfe37f21ccfb83265bf351419d9"; - sha256 = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g="; + hash = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g="; }; cargoHash = "sha256-9fro1Dx7P+P9NTsg0gtMfr0s4TEpkZA31EFAnObiNFo="; @@ -28,4 +26,4 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ happysalada ]; platforms = lib.platforms.unix; }; -} +}) From 61ccc33e3b73a96134a585180bd12839baec910a Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 5 May 2026 18:29:21 +0700 Subject: [PATCH 2/2] lnx: unstable-2022-06-25 -> 0.9.0-master --- pkgs/by-name/ln/lnx/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ln/lnx/package.nix b/pkgs/by-name/ln/lnx/package.nix index 095c3b0fe60b..8a99971810b9 100644 --- a/pkgs/by-name/ln/lnx/package.nix +++ b/pkgs/by-name/ln/lnx/package.nix @@ -1,23 +1,26 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, }: -# unstable was chosen because of an added Cargo.lock -# revert to stable for the version after 0.9.0 rustPlatform.buildRustPackage (finalAttrs: { pname = "lnx"; - version = "unstable-2022-06-25"; - + version = "0.9.0-master"; + src = fetchFromGitHub { owner = "lnx-search"; repo = "lnx"; - rev = "2cb80f344c558bfe37f21ccfb83265bf351419d9"; - hash = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g="; + tag = finalAttrs.version; + hash = "sha256-J2WP+/f6g1UsjpAdCvkdSpiAyDn9dyAXEbqNfWbNbHk="; }; cargoHash = "sha256-9fro1Dx7P+P9NTsg0gtMfr0s4TEpkZA31EFAnObiNFo="; + + # mimalloc uses ATOMIC_VAR_INIT which was removed in C23 (GCC 15 default) + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c17"; + meta = { description = "Ultra-fast, adaptable deployment of the tantivy search engine via REST"; mainProgram = "lnx";