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