From 7ddea363380b2e5bb4298504f1502ed94acd414b Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 9 May 2025 15:27:36 +0800 Subject: [PATCH] cg3: 1.3.9 -> 1.5.1 --- pkgs/by-name/cg/cg3/package.nix | 112 ++++++++++++++++---------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/pkgs/by-name/cg/cg3/package.nix b/pkgs/by-name/cg/cg3/package.nix index e4e142d641ee..6423db36f790 100644 --- a/pkgs/by-name/cg/cg3/package.nix +++ b/pkgs/by-name/cg/cg3/package.nix @@ -7,64 +7,64 @@ cmake, icu, boost, + pkg-config, + sqlite, + cg3, }: -let - cg3 = stdenv.mkDerivation rec { - pname = "cg3"; - version = "1.3.9"; +stdenv.mkDerivation (finalAttrs: { + pname = "cg3"; + version = "1.5.1"; - src = fetchFromGitHub { - owner = "GrammarSoft"; - repo = "cg3"; - rev = "v${version}"; - sha256 = "sha256-TiEhhk90w5GibGZ4yalIf+4qLA8NoU6+GIPN6QNTz2A="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - icu - boost - ]; - - doCheck = true; - - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/cg3.pc \ - --replace '=''${prefix}//' '=/' - ''; - - passthru.tests.minimal = - runCommand "${pname}-test" - { - buildInputs = [ - cg3 - dieHook - ]; - } - '' - echo 'DELIMITERS = "."; ADD (tag) (*);' >grammar.cg3 - printf '""\n\t"a" tag\n\n' >want.txt - printf '""\n\t"a"\n\n' | vislcg3 -g grammar.cg3 >got.txt - diff -s want.txt got.txt || die "Grammar application did not produce expected parse" - touch $out - ''; - - # TODO, consider optionals: - # - Enable tcmalloc unless darwin? - # - Enable python bindings? - - meta = with lib; { - homepage = "https://github.com/GrammarSoft/cg3"; - description = "Constraint Grammar interpreter, compiler and applicator vislcg3"; - maintainers = with maintainers; [ unhammer ]; - license = licenses.gpl3Plus; - platforms = platforms.all; - }; + src = fetchFromGitHub { + owner = "GrammarSoft"; + repo = "cg3"; + tag = "v${finalAttrs.version}"; + hash = "sha256-R3ePghkr4m6FmiHfhPVdLRAJaipIBhGLOX0Hz1nNPv4="; }; -in -cg3 + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + icu + boost + sqlite + ]; + + doCheck = true; + + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/cg3.pc \ + --replace-fail '=''${prefix}//' '=/' + ''; + + passthru.tests.minimal = + runCommand "cg3-test" + { + buildInputs = [ + cg3 + dieHook + ]; + } + '' + echo 'DELIMITERS = "."; ADD (tag) (*);' >grammar.cg3 + printf '""\n\t"a" tag\n\n' >want.txt + printf '""\n\t"a"\n\n' | vislcg3 -g grammar.cg3 >got.txt + diff -s want.txt got.txt || die "Grammar application did not produce expected parse" + touch $out + ''; + + # TODO, consider optionals: + # - Enable tcmalloc unless darwin? + # - Enable python bindings? + meta = { + homepage = "https://github.com/GrammarSoft/cg3"; + description = "Constraint Grammar interpreter, compiler and applicator vislcg3"; + maintainers = with lib.maintainers; [ unhammer ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + }; +})