From 59ad2ae0709dcaead6762d6be8a66f0eb86fb277 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Tue, 5 May 2026 13:33:02 -0700
Subject: [PATCH 1/2] link-grammar: 5.10.5 -> 5.13.0

---
 pkgs/by-name/li/link-grammar/package.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/li/link-grammar/package.nix b/pkgs/by-name/li/link-grammar/package.nix
index f380ccddf09a..c187cf1a7dda 100644
--- a/pkgs/by-name/li/link-grammar/package.nix
+++ b/pkgs/by-name/li/link-grammar/package.nix
@@ -5,17 +5,18 @@
   pkg-config,
   python3,
   flex,
-  sqlite,
   libedit,
+  pcre2,
+  sqlite,
   runCommand,
   dieHook,
 }:
 
 let
 
-  link-grammar = stdenv.mkDerivation rec {
+  link-grammar = stdenv.mkDerivation (finalAttrs: {
     pname = "link-grammar";
-    version = "5.10.5";
+    version = "5.13.0";
 
     outputs = [
       "bin"
@@ -25,8 +26,8 @@ let
     ];
 
     src = fetchurl {
-      url = "http://www.abisource.com/downloads/link-grammar/${version}/link-grammar-${version}.tar.gz";
-      sha256 = "sha256-MkcQzYEyl1/5zLU1CXMvdVhHOxwZ8XiSAAo97bhhiu0=";
+      url = "https://www.gnucash.org/link-grammar/downloads/${finalAttrs.version}/link-grammar-${finalAttrs.version}.tar.gz";
+      hash = "sha256-5qDJBd+xdfNZefA1CgzzxnyzimgZ2fK3PGhN/nKpQd8=";
     };
 
     nativeBuildInputs = [
@@ -36,8 +37,9 @@ let
     ];
 
     buildInputs = [
-      sqlite
       libedit
+      pcre2
+      sqlite
     ];
 
     configureFlags = [
@@ -64,13 +66,13 @@ let
 
     meta = {
       description = "Grammar Checking library";
-      homepage = "https://www.abisource.com/projects/link-grammar/";
-      changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog";
+      homepage = "https://opencog.github.io/link-grammar-website/";
+      changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${finalAttrs.version}/ChangeLog";
       license = lib.licenses.lgpl21Only;
       maintainers = with lib.maintainers; [ jtojnar ];
       platforms = lib.platforms.unix;
     };
-  };
+  });
 
 in
 link-grammar

From 99e140a6c90648b04ad8809b85f43e097d46979c Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Fri, 8 May 2026 18:00:17 -0700
Subject: [PATCH 2/2] link-grammar: fix darwin build

---
 pkgs/by-name/li/link-grammar/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/link-grammar/package.nix b/pkgs/by-name/li/link-grammar/package.nix
index c187cf1a7dda..ab5d87c6f85d 100644
--- a/pkgs/by-name/li/link-grammar/package.nix
+++ b/pkgs/by-name/li/link-grammar/package.nix
@@ -38,15 +38,27 @@ let
 
     buildInputs = [
       libedit
-      pcre2
       sqlite
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      pcre2
     ];
 
     configureFlags = [
       "--disable-java-bindings"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # multi-dict and multi-threads crash when built with pcre2
+      # https://github.com/opencog/link-grammar/issues/1514
+      "--disable-pcre2"
     ];
 
-    doCheck = true;
+    preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export DYLD_LIBRARY_PATH=$(pwd)/link-grammar/.libs
+    '';
+
+    # multi-dict test randomly fails on x86_64-darwin
+    doCheck = stdenv.hostPlatform.system != "x86_64-darwin";
 
     passthru.tests = {
       quick =