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