diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-17 06:01:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-17 06:01:12 +0000 |
| commit | 74783b72bcfc4c0903c7e29e9e46b681d2fd8986 (patch) | |
| tree | b2c8eeb0e9999fcaad72d8f4b20e7b5ea85a6c17 /pkgs/tools | |
| parent | 9232271f66e9a378c62774a5346c4ec62538555c (diff) | |
| parent | 365be2abe0dcecf064a40745c688a11939118b5d (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/addic7ed-cli/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/tools/text/link-grammar/default.nix | 6 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/tools/misc/addic7ed-cli/default.nix b/pkgs/tools/misc/addic7ed-cli/default.nix new file mode 100644 index 0000000000000..3ee3a897a906a --- /dev/null +++ b/pkgs/tools/misc/addic7ed-cli/default.nix @@ -0,0 +1,30 @@ +{ lib +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "addic7ed-cli"; + version = "1.4.6"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "182cpwxpdybsgl1nps850ysvvjbqlnx149kri4hxhgm58nqq0qf5"; + }; + + propagatedBuildInputs = with python3Packages; [ + requests + pyquery + ]; + + # Tests require network access + doCheck = false; + pythonImportsCheck = [ "addic7ed_cli" ]; + + meta = with lib; { + description = "A commandline access to addic7ed subtitles"; + homepage = "https://github.com/BenoitZugmeyer/addic7ed-cli"; + license = licenses.mit; + maintainers = with maintainers; [ aethelz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index c685ef603319c..3e348f159c17f 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , python3 +, flex , sqlite , libedit , runCommand @@ -13,18 +14,19 @@ let link-grammar = stdenv.mkDerivation rec { pname = "link-grammar"; - version = "5.10.2"; + version = "5.10.4"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-KM7HUuqg44l66WEzO2knRZ+Laf7+aMKqUnKYPX24abY="; + sha256 = "sha256-Pd4tEsre7aGTlEoereSElisCGXXhwgZDTMt4UEZIf4E="; }; nativeBuildInputs = [ pkg-config python3 + flex ]; buildInputs = [ |