From 12a7f7384e3bd0d2e15d66be5d73e23b6a5561e4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 7 Oct 2025 20:12:13 +0200 Subject: [PATCH] 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" -}