From daa9c7c2a93586aeb6f8c0fe3104c81f63d243ab Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 7 Oct 2025 21:02:19 +0200 Subject: [PATCH] frogdata: move to by-name --- .../fr/frogdata/package.nix} | 35 +++++++++---------- .../libraries/languagemachines/packages.nix | 2 +- .../LanguageMachines-frogdata.json | 5 --- 3 files changed, 18 insertions(+), 24 deletions(-) rename pkgs/{development/libraries/languagemachines/frogdata.nix => by-name/fr/frogdata/package.nix} (56%) delete mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/by-name/fr/frogdata/package.nix similarity index 56% rename from pkgs/development/libraries/languagemachines/frogdata.nix rename to pkgs/by-name/fr/frogdata/package.nix index 76ff3c1f4f18..38700c13dcc1 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/by-name/fr/frogdata/package.nix @@ -1,38 +1,37 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, + autoreconfHook, libtool, pkg-config, autoconf-archive, }: -let - release = lib.importJSON ./release-info/LanguageMachines-frogdata.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "frogdata"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "frogdata-${release.version}.tar.gz"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "frogdata"; + tag = "v${finalAttrs.version}"; + hash = "sha256-f3rPjc8iYPVJsL6pez2WBw+rCxy6xm3DzOi8S+PDkvg="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; buildInputs = [ libtool autoconf-archive ]; - preConfigure = '' - sh bootstrap.sh - ''; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; meta = with lib; { description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; @@ -42,4 +41,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ roberth ]; }; -} +}) diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix index a951cea084b3..6d369dc78f04 100644 --- a/pkgs/development/libraries/languagemachines/packages.nix +++ b/pkgs/development/libraries/languagemachines/packages.nix @@ -12,7 +12,7 @@ in timblserver = pkgs.timblserver; mbt = pkgs.mbt; frog = callPackage ./frog.nix { inherit icu; }; - frogdata = callPackage ./frogdata.nix { }; + frogdata = pkgs.frogdata; test = callPackage ./test.nix { }; } diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json deleted file mode 100644 index 6ea449387172..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "0.13", - "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13", - "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg" -}