From 7180468bc2cf3e379d6d2f373e3564a036501d8a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 19:57:30 +0200
Subject: [PATCH 01/14] ticcutils: move to by-name

---
 .../ti/ticcutils/package.nix}                 | 35 ++++++++++---------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../LanguageMachines-ticcutils.json           |  5 ---
 3 files changed, 20 insertions(+), 22 deletions(-)
 rename pkgs/{development/libraries/languagemachines/ticcutils.nix => by-name/ti/ticcutils/package.nix} (62%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json

diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/by-name/ti/ticcutils/package.nix
similarity index 62%
rename from pkgs/development/libraries/languagemachines/ticcutils.nix
rename to pkgs/by-name/ti/ticcutils/package.nix
index 2c828e557d9d..1ac4e9457bd2 100644
--- a/pkgs/development/libraries/languagemachines/ticcutils.nix
+++ b/pkgs/by-name/ti/ticcutils/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
   libtool,
+  autoreconfHook,
   pkg-config,
   autoconf-archive,
   libxml2,
@@ -13,22 +13,22 @@
   libtar,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-ticcutils.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ticcutils";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "ticcutils-${release.version}.tar.gz";
+  version = "0.15";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "ticcutils";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1+Plo2yZyDJWn/Yk4pawQGzwdx2UBfER9ZYAYLgYGh0=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
+
   buildInputs = [
     libtool
     autoconf-archive
@@ -39,7 +39,10 @@ stdenv.mkDerivation {
     libtar
     # broken but optional: boost
   ];
-  preConfigure = "sh bootstrap.sh";
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
 
   meta = with lib; {
     description = "This module contains useful functions for general use in the TiCC software stack and beyond";
@@ -49,4 +52,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ roberth ];
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index 8a490bbc9867..1515a68a296d 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -4,7 +4,7 @@ let
   icu = pkgs.icu60;
 in
 {
-  ticcutils = callPackage ./ticcutils.nix { };
+  ticcutils = pkgs.ticcutils;
   libfolia = callPackage ./libfolia.nix { inherit icu; };
   ucto = callPackage ./ucto.nix { inherit icu; };
   uctodata = callPackage ./uctodata.nix { };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json
deleted file mode 100644
index 11069c6b02c7..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v0.15",
-  "url": "https://api.github.com/repos/LanguageMachines/ticcutils/tarball/v0.15",
-  "sha256": "0lssb1klx2flmr6fy78j37i5lbq3gfhzjx24j6n72ndm2rvprvcn"
-}

From 33008aefc918ac901644748d28663d978092c705 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 20:06:32 +0200
Subject: [PATCH 02/14] libfolia: move to by-name

---
 .../li/libfolia/package.nix}                  | 42 ++++++++++---------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../LanguageMachines-libfolia.json            |  5 ---
 3 files changed, 23 insertions(+), 26 deletions(-)
 rename pkgs/{development/libraries/languagemachines/libfolia.nix => by-name/li/libfolia/package.nix} (70%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json

diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/by-name/li/libfolia/package.nix
similarity index 70%
rename from pkgs/development/libraries/languagemachines/libfolia.nix
rename to pkgs/by-name/li/libfolia/package.nix
index 33d71bef3beb..c2dc9b1417a6 100644
--- a/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/pkgs/by-name/li/libfolia/package.nix
@@ -1,34 +1,33 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   libtool,
   pkg-config,
   autoconf-archive,
   libxml2,
-  icu,
+  icu60,
   bzip2,
   libtar,
-  languageMachines,
+  ticcutils,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-libfolia.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libfolia";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "libfolia-${release.version}.tar.gz";
+  version = "1.7";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "libfolia";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fH+XqTaMf7/8ZA0lwWiD7s7fmGkjni83Q7lv5sh50H4=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     bzip2
@@ -36,14 +35,17 @@ stdenv.mkDerivation {
     autoconf-archive
     libtar
     libxml2
-    icu
-    languageMachines.ticcutils
+    icu60
+    ticcutils
   ];
-  preConfigure = "sh bootstrap.sh";
 
   # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
   CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
 
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
   meta = with lib; {
     description = "C++ API for FoLiA documents; an XML-based linguistic annotation format";
     mainProgram = "folialint";
@@ -57,4 +59,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index 1515a68a296d..f279dfdeca39 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -5,7 +5,7 @@ let
 in
 {
   ticcutils = pkgs.ticcutils;
-  libfolia = callPackage ./libfolia.nix { inherit icu; };
+  libfolia = pkgs.libfolia;
   ucto = callPackage ./ucto.nix { inherit icu; };
   uctodata = callPackage ./uctodata.nix { };
   timbl = callPackage ./timbl.nix { };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json
deleted file mode 100644
index 792d958213fb..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v1.7",
-  "url": "https://api.github.com/repos/LanguageMachines/libfolia/tarball/v1.7",
-  "sha256": "0hpxdry7n2887klryc587xv46p6z6jp6hz9x7k2pk5v7jb0z4s65"
-}

From 12a7f7384e3bd0d2e15d66be5d73e23b6a5561e4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 20:12:13 +0200
Subject: [PATCH 03/14] uctodata: move to by-name

---
 .../uc/uctodata/package.nix}                  | 35 ++++++++++---------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../LanguageMachines-uctodata.json            |  5 ---
 3 files changed, 20 insertions(+), 22 deletions(-)
 rename pkgs/{development/libraries/languagemachines/uctodata.nix => by-name/uc/uctodata/package.nix} (72%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json

diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/by-name/uc/uctodata/package.nix
similarity index 72%
rename from pkgs/development/libraries/languagemachines/uctodata.nix
rename to pkgs/by-name/uc/uctodata/package.nix
index 0d2043a6a10a..d264d93df070 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/pkgs/by-name/uc/uctodata/package.nix
@@ -1,35 +1,38 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   libtool,
   pkg-config,
   autoconf-archive,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-uctodata.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "uctodata";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "uctodata-${release.version}.tar.gz";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "uctodata";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4P9icZSm+DYGxGobSGzSExTv+ZQaLjkJ0gvOI27byRk=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
+
   buildInputs = [
     libtool
     autoconf-archive
   ];
-  preConfigure = "sh bootstrap.sh";
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
 
   meta = with lib; {
     description = "Rule-based tokenizer for natural language";
@@ -45,4 +48,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index f279dfdeca39..9e4d150d2dcd 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -7,7 +7,7 @@ in
   ticcutils = pkgs.ticcutils;
   libfolia = pkgs.libfolia;
   ucto = callPackage ./ucto.nix { inherit icu; };
-  uctodata = callPackage ./uctodata.nix { };
+  uctodata = pkgs.uctodata;
   timbl = callPackage ./timbl.nix { };
   timblserver = callPackage ./timblserver.nix { };
   mbt = callPackage ./mbt.nix { };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json
deleted file mode 100644
index 08069bb333bc..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v0.4",
-  "url": "https://api.github.com/repos/LanguageMachines/uctodata/tarball/v0.4",
-  "sha256": "02c78qmwi9ijpk5wila3p62fmfdy1rpmlvvzbxs3wg0rdb0nwvd2"
-}

From f7ddbc808d9e337976099993405acde3b06d7a6f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 20:23:16 +0200
Subject: [PATCH 04/14] ucto: move to by-name

---
 .../ucto.nix => by-name/uc/ucto/package.nix}  | 50 ++++++++++---------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../release-info/LanguageMachines-ucto.json   |  5 --
 3 files changed, 28 insertions(+), 29 deletions(-)
 rename pkgs/{development/libraries/languagemachines/ucto.nix => by-name/uc/ucto/package.nix} (71%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json

diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/by-name/uc/ucto/package.nix
similarity index 71%
rename from pkgs/development/libraries/languagemachines/ucto.nix
rename to pkgs/by-name/uc/ucto/package.nix
index f9b70f835685..84129a2e3cb0 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/pkgs/by-name/uc/ucto/package.nix
@@ -1,58 +1,62 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   libtool,
   pkg-config,
   autoconf-archive,
   libxml2,
-  icu,
+  icu60,
   bzip2,
   libtar,
-  languageMachines,
+  ticcutils,
+  libfolia,
+  uctodata,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-ucto.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ucto";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "ucto-${release.version}.tar.gz";
+  version = "0.9.6";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "ucto";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DFQ4ePE3n3zg0mrqUNHzE3Hi81n1IurYjhh6YVAghEE=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     bzip2
     libtool
     autoconf-archive
-    icu
+    icu60
     libtar
     libxml2
-    languageMachines.ticcutils
-    languageMachines.libfolia
-    languageMachines.uctodata
+    ticcutils
+    libfolia
+    uctodata
     # TODO textcat from libreoffice? Pulls in X11 dependencies?
   ];
-  preConfigure = "sh bootstrap.sh;";
 
   postInstall = ''
     # ucto expects the data files installed in the same prefix
     mkdir -p $out/share/ucto/;
-    for f in ${languageMachines.uctodata}/share/ucto/*; do
+    for f in ${uctodata}/share/ucto/*; do
       echo "Linking $f"
       ln -s $f $out/share/ucto/;
     done;
   '';
 
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
   meta = with lib; {
     description = "Rule-based tokenizer for natural language";
     mainProgram = "ucto";
@@ -68,4 +72,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index 9e4d150d2dcd..0679880bc50c 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -6,7 +6,7 @@ in
 {
   ticcutils = pkgs.ticcutils;
   libfolia = pkgs.libfolia;
-  ucto = callPackage ./ucto.nix { inherit icu; };
+  ucto = pkgs.ucto;
   uctodata = pkgs.uctodata;
   timbl = callPackage ./timbl.nix { };
   timblserver = callPackage ./timblserver.nix { };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
deleted file mode 100644
index 9b05cf3e1393..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v0.9.6",
-  "url": "https://api.github.com/repos/LanguageMachines/ucto/tarball/v0.9.6",
-  "sha256": "0fxq4j32g7kp6789xz23651c4v2j7zlz87cshfv9g1xjs7jxns3f"
-}

From 6196a9548540890eb4527103b39e7b636904aaae Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 20:30:36 +0200
Subject: [PATCH 05/14] timbl: move to by-name

---
 .../ti/timbl/package.nix}                     | 38 ++++++++++---------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../release-info/LanguageMachines-timbl.json  |  5 ---
 3 files changed, 21 insertions(+), 24 deletions(-)
 rename pkgs/{development/libraries/languagemachines/timbl.nix => by-name/ti/timbl/package.nix} (78%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json

diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/by-name/ti/timbl/package.nix
similarity index 78%
rename from pkgs/development/libraries/languagemachines/timbl.nix
rename to pkgs/by-name/ti/timbl/package.nix
index 77b63ac818c6..7a47a389d114 100644
--- a/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/pkgs/by-name/ti/timbl/package.nix
@@ -1,33 +1,32 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   libtool,
   pkg-config,
   autoconf-archive,
   libxml2,
   bzip2,
   libtar,
-  languageMachines,
+  ticcutils,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-timbl.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "timbl";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "timbl-${release.version}.tar.gz";
+  version = "6.4.9";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "timbl";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6hg/NiA5c5txyB7xYSlxA2WzAyNTF6JpupLpmzfxOYg=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     bzip2
@@ -35,9 +34,12 @@ stdenv.mkDerivation {
     libtool
     autoconf-archive
     libxml2
-    languageMachines.ticcutils
+    ticcutils
   ];
-  preConfigure = "sh bootstrap.sh";
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
 
   meta = with lib; {
     description = "TiMBL implements several memory-based learning algorithms";
@@ -54,4 +56,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index 0679880bc50c..dbe68ba54748 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -8,7 +8,7 @@ in
   libfolia = pkgs.libfolia;
   ucto = pkgs.ucto;
   uctodata = pkgs.uctodata;
-  timbl = callPackage ./timbl.nix { };
+  timbl = pkgs.timbl;
   timblserver = callPackage ./timblserver.nix { };
   mbt = callPackage ./mbt.nix { };
   frog = callPackage ./frog.nix { inherit icu; };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json
deleted file mode 100644
index d35f2c8333aa..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v6.4.9",
-  "url": "https://api.github.com/repos/LanguageMachines/timbl/tarball/v6.4.9",
-  "sha256": "1279npc3xlq05hnkylpbkgg941gjhvl6sd5fw4vgwcx2rwmmlaay"
-}

From bb380596cea6a85f0d48fbf6f66ba44e28073baa Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 20:37:40 +0200
Subject: [PATCH 06/14] timblserver: move to by-name

---
 .../ti/timblserver/package.nix}               | 41 ++++++++++---------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../LanguageMachines-timblserver.json         |  5 ---
 3 files changed, 23 insertions(+), 25 deletions(-)
 rename pkgs/{development/libraries/languagemachines/timblserver.nix => by-name/ti/timblserver/package.nix} (77%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json

diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/by-name/ti/timblserver/package.nix
similarity index 77%
rename from pkgs/development/libraries/languagemachines/timblserver.nix
rename to pkgs/by-name/ti/timblserver/package.nix
index 66c8388012cd..49dcd8ce6757 100644
--- a/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/pkgs/by-name/ti/timblserver/package.nix
@@ -1,33 +1,33 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   bzip2,
   libtar,
   libtool,
   pkg-config,
   autoconf-archive,
   libxml2,
-  languageMachines,
+  ticcutils,
+  timbl,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-timblserver.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "timblserver";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "timblserver-${release.version}.tar.gz";
+  version = "1.11";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "timblserver";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-TE6fsgr/L5GcBjFKlU6S1DiT8OKP6i7TVirxj/OfhlM=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     bzip2
@@ -35,10 +35,13 @@ stdenv.mkDerivation {
     libtool
     autoconf-archive
     libxml2
-    languageMachines.ticcutils
-    languageMachines.timbl
+    ticcutils
+    timbl
   ];
-  preConfigure = "sh bootstrap.sh";
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
 
   meta = with lib; {
     description = "This server for TiMBL implements several memory-based learning algorithms";
@@ -54,4 +57,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index dbe68ba54748..b037ec548ecc 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -9,7 +9,7 @@ in
   ucto = pkgs.ucto;
   uctodata = pkgs.uctodata;
   timbl = pkgs.timbl;
-  timblserver = callPackage ./timblserver.nix { };
+  timblserver = pkgs.timblserver;
   mbt = callPackage ./mbt.nix { };
   frog = callPackage ./frog.nix { inherit icu; };
   frogdata = callPackage ./frogdata.nix { };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json
deleted file mode 100644
index d588da3f8b6e..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v1.11",
-  "url": "https://api.github.com/repos/LanguageMachines/timblserver/tarball/v1.11",
-  "sha256": "02k8c704wr5miy82w6zj0imm7sdfnxf3db34qiaa8l3myhn17qlw"
-}

From c76d7e78e652487c6eb7412793adbae27e28930b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 20:56:16 +0200
Subject: [PATCH 07/14] mbt: move to by-name

---
 .../mb/mbt}/mbt-add-libxml2-dep.patch         |  0
 .../mbt.nix => by-name/mb/mbt/package.nix}    | 43 ++++++++++---------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../release-info/LanguageMachines-mbt.json    |  5 ---
 4 files changed, 23 insertions(+), 27 deletions(-)
 rename pkgs/{development/libraries/languagemachines => by-name/mb/mbt}/mbt-add-libxml2-dep.patch (100%)
 rename pkgs/{development/libraries/languagemachines/mbt.nix => by-name/mb/mbt/package.nix} (71%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json

diff --git a/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch b/pkgs/by-name/mb/mbt/mbt-add-libxml2-dep.patch
similarity index 100%
rename from pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch
rename to pkgs/by-name/mb/mbt/mbt-add-libxml2-dep.patch
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/by-name/mb/mbt/package.nix
similarity index 71%
rename from pkgs/development/libraries/languagemachines/mbt.nix
rename to pkgs/by-name/mb/mbt/package.nix
index 51238615f9e9..5a5674c1ddb4 100644
--- a/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/pkgs/by-name/mb/mbt/package.nix
@@ -1,33 +1,33 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   bzip2,
   libtar,
   libtool,
   pkg-config,
   autoconf-archive,
   libxml2,
-  languageMachines,
+  ticcutils,
+  timbl,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-mbt.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mbt";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "mbt-${release.version}.tar.gz";
+  version = "3.2.16";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "mbt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-O/LhLWgLwDctkRYjds+AM9fGMIRX3eCnJhRIXyVrJ04=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     bzip2
@@ -35,13 +35,14 @@ stdenv.mkDerivation {
     libtool
     autoconf-archive
     libxml2
-    languageMachines.ticcutils
-    languageMachines.timbl
+    ticcutils
+    timbl
   ];
   patches = [ ./mbt-add-libxml2-dep.patch ];
-  preConfigure = ''
-    sh bootstrap.sh
-  '';
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
 
   meta = with lib; {
     description = "Memory Based Tagger";
@@ -57,4 +58,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index b037ec548ecc..a951cea084b3 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -10,7 +10,7 @@ in
   uctodata = pkgs.uctodata;
   timbl = pkgs.timbl;
   timblserver = pkgs.timblserver;
-  mbt = callPackage ./mbt.nix { };
+  mbt = pkgs.mbt;
   frog = callPackage ./frog.nix { inherit icu; };
   frogdata = callPackage ./frogdata.nix { };
 
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json
deleted file mode 100644
index f1bbff47a28e..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v3.2.16",
-  "url": "https://api.github.com/repos/LanguageMachines/mbt/tarball/v3.2.16",
-  "sha256": "0f9f5l84m0lmmv4km9myn3yhy67jbmk3qn2fi40dy025gx4l0x3x"
-}

From daa9c7c2a93586aeb6f8c0fe3104c81f63d243ab Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 21:02:19 +0200
Subject: [PATCH 08/14] frogdata: move to by-name

---
 .../fr/frogdata/package.nix}                  | 35 +++++++++----------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../LanguageMachines-frogdata.json            |  5 ---
 3 files changed, 18 insertions(+), 24 deletions(-)
 rename pkgs/{development/libraries/languagemachines/frogdata.nix => by-name/fr/frogdata/package.nix} (56%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json

diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/by-name/fr/frogdata/package.nix
similarity index 56%
rename from pkgs/development/libraries/languagemachines/frogdata.nix
rename to pkgs/by-name/fr/frogdata/package.nix
index 76ff3c1f4f18..38700c13dcc1 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/pkgs/by-name/fr/frogdata/package.nix
@@ -1,38 +1,37 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   libtool,
   pkg-config,
   autoconf-archive,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-frogdata.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "frogdata";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "frogdata-${release.version}.tar.gz";
+  version = "0.13";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "frogdata";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-f3rPjc8iYPVJsL6pez2WBw+rCxy6xm3DzOi8S+PDkvg=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     libtool
     autoconf-archive
   ];
 
-  preConfigure = ''
-    sh bootstrap.sh
-  '';
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
 
   meta = with lib; {
     description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
@@ -42,4 +41,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ roberth ];
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index a951cea084b3..6d369dc78f04 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -12,7 +12,7 @@ in
   timblserver = pkgs.timblserver;
   mbt = pkgs.mbt;
   frog = callPackage ./frog.nix { inherit icu; };
-  frogdata = callPackage ./frogdata.nix { };
+  frogdata = pkgs.frogdata;
 
   test = callPackage ./test.nix { };
 }
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
deleted file mode 100644
index 6ea449387172..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "0.13",
-  "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13",
-  "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg"
-}

From 0a81759d2cb08e409506d81c2045303b16feaca0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 21:14:47 +0200
Subject: [PATCH 09/14] frog: move to by-name

---
 .../frog.nix => by-name/fr/frog/package.nix}  | 61 ++++++++++---------
 .../libraries/languagemachines/packages.nix   |  2 +-
 .../release-info/LanguageMachines-frog.json   |  5 --
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 34 insertions(+), 36 deletions(-)
 rename pkgs/{development/libraries/languagemachines/frog.nix => by-name/fr/frog/package.nix} (75%)
 delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json

diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/by-name/fr/frog/package.nix
similarity index 75%
rename from pkgs/development/libraries/languagemachines/frog.nix
rename to pkgs/by-name/fr/frog/package.nix
index d9864573c3b5..6c8b52841c9b 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/by-name/fr/frog/package.nix
@@ -1,34 +1,38 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   bzip2,
   libtar,
   libtool,
   pkg-config,
   autoconf-archive,
   libxml2,
-  icu,
-  languageMachines,
+  icu60,
+  ticcutils,
+  timbl,
+  mbt,
+  libfolia,
+  ucto,
+  frogdata,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-frog.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "frog";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "frog-v${release.version}.tar.gz";
+  version = "0.13.7";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "frog";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-khc2uZ/dOtWPTnt/ZD6ILxD386MaZt6fsvNTWTCbs+c=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     bzip2
@@ -36,28 +40,29 @@ stdenv.mkDerivation {
     libtool
     autoconf-archive
     libxml2
-    icu
-    languageMachines.ticcutils
-    languageMachines.timbl
-    languageMachines.mbt
-    languageMachines.libfolia
-    languageMachines.ucto
-    languageMachines.frogdata
+    icu60
+    ticcutils
+    timbl
+    mbt
+    libfolia
+    ucto
+    frogdata
   ];
 
-  preConfigure = ''
-    sh bootstrap.sh
-  '';
   postInstall = ''
     # frog expects the data files installed in the same prefix
     mkdir -p $out/share/frog/;
-    for f in ${languageMachines.frogdata}/share/frog/*; do
+    for f in ${frogdata}/share/frog/*; do
       ln -s $f $out/share/frog/;
     done;
 
     make check
   '';
 
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
   meta = with lib; {
     description = "Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
     homepage = "https://languagemachines.github.io/frog";
@@ -72,4 +77,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index 6d369dc78f04..afd9d5c2f1fd 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -11,7 +11,7 @@ in
   timbl = pkgs.timbl;
   timblserver = pkgs.timblserver;
   mbt = pkgs.mbt;
-  frog = callPackage ./frog.nix { inherit icu; };
+  frog = pkgs.frog;
   frogdata = pkgs.frogdata;
 
   test = callPackage ./test.nix { };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
deleted file mode 100644
index 55c2ec20a312..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v0.13.7",
-  "url": "https://api.github.com/repos/LanguageMachines/frog/tarball/v0.13.7",
-  "sha256": "0swyfi3g862n888qj8v8kd18745hasy0vnc70i9qlv0ji0321bnf"
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7095a4494e79..48e2ab540f29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7286,8 +7286,6 @@ with pkgs;
     };
   };
 
-  frog = res.languageMachines.frog;
-
   fontconfig = callPackage ../development/libraries/fontconfig { };
 
   makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };

From f30f10c058c0d8caace9509e814ccd43c22ac254 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 21:19:16 +0200
Subject: [PATCH 10/14] frog: move test into it

---
 pkgs/by-name/fr/frog/package.nix                              | 2 ++
 .../libraries/languagemachines => by-name/fr/frog}/test.nix   | 4 ++--
 pkgs/development/libraries/languagemachines/packages.nix      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename pkgs/{development/libraries/languagemachines => by-name/fr/frog}/test.nix (89%)

diff --git a/pkgs/by-name/fr/frog/package.nix b/pkgs/by-name/fr/frog/package.nix
index 6c8b52841c9b..fe7369dd71d3 100644
--- a/pkgs/by-name/fr/frog/package.nix
+++ b/pkgs/by-name/fr/frog/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   gitUpdater,
+  callPackage,
   autoreconfHook,
   bzip2,
   libtar,
@@ -61,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
+    tests.simple = callPackage ./test.nix { };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/languagemachines/test.nix b/pkgs/by-name/fr/frog/test.nix
similarity index 89%
rename from pkgs/development/libraries/languagemachines/test.nix
rename to pkgs/by-name/fr/frog/test.nix
index 57965a758311..7b624e85f306 100644
--- a/pkgs/development/libraries/languagemachines/test.nix
+++ b/pkgs/by-name/fr/frog/test.nix
@@ -1,10 +1,10 @@
 {
   runCommand,
-  languageMachines,
+  frog,
 }:
 
 runCommand "frog-test" { } ''
-  ${languageMachines.frog}/bin/frog >$out <<EOF
+  ${frog}/bin/frog >$out <<EOF
   Dit is een test
 
   EOF
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index afd9d5c2f1fd..9fccc23f1eee 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -14,5 +14,5 @@ in
   frog = pkgs.frog;
   frogdata = pkgs.frogdata;
 
-  test = callPackage ./test.nix { };
+  test = pkgs.frog.tests.simple;
 }

From 2d8cbdb5250692fb901723ce3cfe4afcb9760df7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 7 Oct 2025 21:27:36 +0200
Subject: [PATCH 11/14] languageMachines: drop

---
 .../libraries/languagemachines/packages.nix   | 18 -----
 .../libraries/languagemachines/update         | 79 -------------------
 pkgs/top-level/aliases.nix                    | 12 +++
 pkgs/top-level/all-packages.nix               |  6 --
 4 files changed, 12 insertions(+), 103 deletions(-)
 delete mode 100644 pkgs/development/libraries/languagemachines/packages.nix
 delete mode 100755 pkgs/development/libraries/languagemachines/update

diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
deleted file mode 100644
index 9fccc23f1eee..000000000000
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs }:
-let
-  inherit (pkgs) callPackage;
-  icu = pkgs.icu60;
-in
-{
-  ticcutils = pkgs.ticcutils;
-  libfolia = pkgs.libfolia;
-  ucto = pkgs.ucto;
-  uctodata = pkgs.uctodata;
-  timbl = pkgs.timbl;
-  timblserver = pkgs.timblserver;
-  mbt = pkgs.mbt;
-  frog = pkgs.frog;
-  frogdata = pkgs.frogdata;
-
-  test = pkgs.frog.tests.simple;
-}
diff --git a/pkgs/development/libraries/languagemachines/update b/pkgs/development/libraries/languagemachines/update
deleted file mode 100755
index 3189637df746..000000000000
--- a/pkgs/development/libraries/languagemachines/update
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --packages curl
-#!nix-shell --packages jq
-#!nix-shell --packages parallel
-#!nix-shell -i bash
-
-# Exit immediately if a command exits with a non-zero status.
-# Exit when a producer fails in a pipe
-# Treat undefined variable references as errors
-set -e -o pipefail -u
-
-# Check if working directory is (probably) right
-test "./update" = $0 || {
-    echo "The working directory ought to be the same is the update script location. Please invoke as ./update" 1>&2
-    exit 1
-}
-
-# Create temporary directory with automatic cleanup
-readonly MY_TMP="$(mktemp -d)"
-cleanup () {
-    rm -rf "$MY_TMP"
-}
-trap cleanup EXIT
-
-# stdout: file containing release info and a convenient placeholder
-# for the sha256 attribute
-getRelease () {
-    local owner="$1"
-    local repo="$2"
-    local out="$MY_TMP/$owner--$repo-release"
-    curl -fSs https://api.github.com/repos/"$owner"/"$repo"/releases/latest \
-        | jq '{ version: .name, url: .tarball_url, sha256: "__SHA256__" }' \
-             > "$out"
-    echo "$out"
-}
-
-# 'getters' for the release info file
-
-# stdout: unquoted tarball url
-releaseUrl () {
-    local file="$1"
-    jq -r '.url' <"$file"
-}
-
-# stdout: unquoted version
-releaseVersion () {
-    local file="$1"
-    jq -r '.version' <"$file"
-}
-
-# Fetch release tarball and compute hash
-# stdout: base32 sha256 to be used in fetchurl
-getReleaseHash () {
-    local file="$1"
-    local name="$2"
-    nix-prefetch-url "$(releaseUrl "$file")" --name "$name-$(releaseVersion "$file").tar.gz"
-}
-
-# Write a release info file to release-info/$owner-$repo.json
-updateRelease () {
-    local owner="$1"
-    local repo="$2"
-    local r="$(getRelease "$owner" "$repo")"
-    local hash="$(getReleaseHash "$r" "$repo")"
-    sed \
-      -e s/__SHA256__/"$hash"/\
-      <"$r" \
-      >"release-info/$owner-$repo.json"
-}
-
-updateRelease LanguageMachines frogdata
-updateRelease LanguageMachines frog
-updateRelease LanguageMachines libfolia
-updateRelease LanguageMachines mbt
-updateRelease LanguageMachines ticcutils
-updateRelease LanguageMachines timbl
-updateRelease LanguageMachines timblserver
-updateRelease LanguageMachines ucto
-updateRelease LanguageMachines uctodata
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b68aeeb3cf5f..d3c69bd85fe4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1304,6 +1304,18 @@ mapAliases {
   ### L ###
 
   l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14
+  languageMachines = {
+    ticcutils = ticcutils;
+    libfolia = libfolia;
+    ucto = ucto;
+    uctodata = uctodata;
+    timbl = timbl;
+    timblserver = timblserver;
+    mbt = mbt;
+    frog = frog;
+    frogdata = frogdata;
+    test = frog.tests.simple;
+  }; # Added 2025-10-07
   larynx = piper-tts; # Added 2023-05-09
   LASzip = laszip; # Added 2024-06-12
   LASzip2 = laszip_2; # Added 2024-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48e2ab540f29..8b63b3f30b07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7755,12 +7755,6 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  languageMachines = recurseIntoAttrs (
-    import ../development/libraries/languagemachines/packages.nix {
-      inherit pkgs;
-    }
-  );
-
   lcms = lcms2;
 
   libagar = callPackage ../development/libraries/libagar { };

From 60f2bc1920d422de3173784c380368c045fce1a8 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 8 Oct 2025 16:29:53 +0200
Subject: [PATCH 12/14] frog: make tests override-coherent

---
 pkgs/by-name/fr/frog/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/frog/package.nix b/pkgs/by-name/fr/frog/package.nix
index fe7369dd71d3..e2ef0647f8fb 100644
--- a/pkgs/by-name/fr/frog/package.nix
+++ b/pkgs/by-name/fr/frog/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
-    tests.simple = callPackage ./test.nix { };
+    tests.simple = callPackage ./test.nix { frog = finalAttrs.finalPackage; };
   };
 
   meta = with lib; {

From a01dd8a9b2f24b0ed9396480880a9ed138f4ed5d Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 8 Oct 2025 17:01:51 +0200
Subject: [PATCH 13/14] languageMachines: add frog as reverse dependency test

Add frog to the test suite of its transitive dependencies within the
LanguageMachines ecosystem (ticcutils, libfolia, uctodata, ucto, timbl,
mbt, frogdata) to catch breakages early when these packages are updated.

timblserver is not included as it is not a dependency of frog.
---
 pkgs/by-name/fr/frogdata/package.nix  | 9 +++++++++
 pkgs/by-name/li/libfolia/package.nix  | 9 +++++++++
 pkgs/by-name/mb/mbt/package.nix       | 9 +++++++++
 pkgs/by-name/ti/ticcutils/package.nix | 9 +++++++++
 pkgs/by-name/ti/timbl/package.nix     | 9 +++++++++
 pkgs/by-name/uc/ucto/package.nix      | 9 +++++++++
 pkgs/by-name/uc/uctodata/package.nix  | 9 +++++++++
 7 files changed, 63 insertions(+)

diff --git a/pkgs/by-name/fr/frogdata/package.nix b/pkgs/by-name/fr/frogdata/package.nix
index 38700c13dcc1..65e1d95a75c4 100644
--- a/pkgs/by-name/fr/frogdata/package.nix
+++ b/pkgs/by-name/fr/frogdata/package.nix
@@ -7,6 +7,7 @@
   libtool,
   pkg-config,
   autoconf-archive,
+  frog,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      /**
+        Reverse dependencies. Does not respect overrides.
+      */
+      reverseDependencies = lib.recurseIntoAttrs {
+        inherit frog;
+      };
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/li/libfolia/package.nix b/pkgs/by-name/li/libfolia/package.nix
index c2dc9b1417a6..a428f7e1d232 100644
--- a/pkgs/by-name/li/libfolia/package.nix
+++ b/pkgs/by-name/li/libfolia/package.nix
@@ -12,6 +12,7 @@
   bzip2,
   libtar,
   ticcutils,
+  frog,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -44,6 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      /**
+        Reverse dependencies. Does not respect overrides.
+      */
+      reverseDependencies = lib.recurseIntoAttrs {
+        inherit frog;
+      };
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/mb/mbt/package.nix b/pkgs/by-name/mb/mbt/package.nix
index 5a5674c1ddb4..47ddf4d89956 100644
--- a/pkgs/by-name/mb/mbt/package.nix
+++ b/pkgs/by-name/mb/mbt/package.nix
@@ -12,6 +12,7 @@
   libxml2,
   ticcutils,
   timbl,
+  frog,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +43,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      /**
+        Reverse dependencies. Does not respect overrides.
+      */
+      reverseDependencies = lib.recurseIntoAttrs {
+        inherit frog;
+      };
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/ti/ticcutils/package.nix b/pkgs/by-name/ti/ticcutils/package.nix
index 1ac4e9457bd2..e837355fc53a 100644
--- a/pkgs/by-name/ti/ticcutils/package.nix
+++ b/pkgs/by-name/ti/ticcutils/package.nix
@@ -11,6 +11,7 @@
   zlib,
   bzip2,
   libtar,
+  frog,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +43,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      /**
+        Reverse dependencies. Does not respect overrides.
+      */
+      reverseDependencies = lib.recurseIntoAttrs {
+        inherit frog;
+      };
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/ti/timbl/package.nix b/pkgs/by-name/ti/timbl/package.nix
index 7a47a389d114..0322dff165d9 100644
--- a/pkgs/by-name/ti/timbl/package.nix
+++ b/pkgs/by-name/ti/timbl/package.nix
@@ -11,6 +11,7 @@
   bzip2,
   libtar,
   ticcutils,
+  frog,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,6 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      /**
+        Reverse dependencies. Does not respect overrides.
+      */
+      reverseDependencies = lib.recurseIntoAttrs {
+        inherit frog;
+      };
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/uc/ucto/package.nix b/pkgs/by-name/uc/ucto/package.nix
index 84129a2e3cb0..69582342d2b3 100644
--- a/pkgs/by-name/uc/ucto/package.nix
+++ b/pkgs/by-name/uc/ucto/package.nix
@@ -14,6 +14,7 @@
   ticcutils,
   libfolia,
   uctodata,
+  frog,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -55,6 +56,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      /**
+        Reverse dependencies. Does not respect overrides.
+      */
+      reverseDependencies = lib.recurseIntoAttrs {
+        inherit frog;
+      };
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/uc/uctodata/package.nix b/pkgs/by-name/uc/uctodata/package.nix
index d264d93df070..0824ec5b3bd7 100644
--- a/pkgs/by-name/uc/uctodata/package.nix
+++ b/pkgs/by-name/uc/uctodata/package.nix
@@ -7,6 +7,7 @@
   libtool,
   pkg-config,
   autoconf-archive,
+  frog,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      /**
+        Reverse dependencies. Does not respect overrides.
+      */
+      reverseDependencies = lib.recurseIntoAttrs {
+        inherit frog;
+      };
+    };
   };
 
   meta = with lib; {

From fcae78213f45f4dbf5c61d6d2929d47e0298b5b6 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 8 Oct 2025 17:04:06 +0200
Subject: [PATCH 14/14] languageMachines: add timblserver as reverse dependency
 test

---
 pkgs/by-name/ti/ticcutils/package.nix | 3 ++-
 pkgs/by-name/ti/timbl/package.nix     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ti/ticcutils/package.nix b/pkgs/by-name/ti/ticcutils/package.nix
index e837355fc53a..341ea6fe6a4b 100644
--- a/pkgs/by-name/ti/ticcutils/package.nix
+++ b/pkgs/by-name/ti/ticcutils/package.nix
@@ -12,6 +12,7 @@
   bzip2,
   libtar,
   frog,
+  timblserver,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
         Reverse dependencies. Does not respect overrides.
       */
       reverseDependencies = lib.recurseIntoAttrs {
-        inherit frog;
+        inherit frog timblserver;
       };
     };
   };
diff --git a/pkgs/by-name/ti/timbl/package.nix b/pkgs/by-name/ti/timbl/package.nix
index 0322dff165d9..5caf814cb190 100644
--- a/pkgs/by-name/ti/timbl/package.nix
+++ b/pkgs/by-name/ti/timbl/package.nix
@@ -12,6 +12,7 @@
   libtar,
   ticcutils,
   frog,
+  timblserver,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -45,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
         Reverse dependencies. Does not respect overrides.
       */
       reverseDependencies = lib.recurseIntoAttrs {
-        inherit frog;
+        inherit frog timblserver;
       };
     };
   };