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] 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"
-}