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