From dc912f45d764c20370a186e6a008bf844620b734 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 23:58:43 +0000 Subject: [PATCH 1/2] link-grammar: 5.8.0 -> 5.8.1 --- pkgs/tools/text/link-grammar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index d3ecc519a5f..e243206a114 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib }: stdenv.mkDerivation rec { - version = "5.8.0"; + version = "5.8.1"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd"; + sha256 = "sha256-EcT/VR+lFpJX2sxXUIDGOwdceQ7awpmEqUZBoJk7UFs="; }; nativeBuildInputs = [ pkg-config python3 ]; From db28fc965bb946fcb96972789c4376e2cb9cfbad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 20 Jan 2021 10:24:43 +0100 Subject: [PATCH 2/2] link-grammar: Improve - Add meta.changelog - Correct license - Run tests - Add quick smoke test to passthru.tests --- pkgs/tools/text/link-grammar/default.nix | 29 ++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index e243206a114..b5cfdcbfc0c 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib }: +{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib, runCommand, dieHook }: -stdenv.mkDerivation rec { +let + +link-grammar = stdenv.mkDerivation rec { version = "5.8.1"; pname = "link-grammar"; @@ -18,11 +20,30 @@ stdenv.mkDerivation rec { "--disable-java-bindings" ]; + doCheck = true; + + passthru.tests = { + quick = runCommand "link-grammar-quick-test" { + buildInputs = [ + link-grammar + dieHook + ]; + } '' + echo "Furiously sleep ideas green colorless." | link-parser en | grep "No complete linkages found." || die "Grammaticaly invalid sentence was parsed." + echo "Colorless green ideas sleep furiously." | link-parser en | grep "Found .* linkages." || die "Grammaticaly valid sentence was not parsed." + touch $out + ''; + }; + meta = with lib; { description = "A Grammar Checking library"; homepage = "https://www.abisource.com/projects/link-grammar/"; - license = licenses.lgpl21; + changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog"; + license = licenses.lgpl21Only; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; -} +}; + +in + link-grammar