diff options
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/chars/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/chroma/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/chroma/src.json | 8 | ||||
-rw-r--r-- | pkgs/tools/text/colordiff/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/csview/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/difftastic/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/text/goawk/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/text/gpt2tc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/text/link-grammar/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/mdbook-linkcheck/default.nix | 33 | ||||
-rw-r--r-- | pkgs/tools/text/mdbook-mermaid/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/mdcat/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/text/patchutils/generic.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/ruplacer/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/sad/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/ugrep/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/vale/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/xml/html-xml-utils/default.nix | 4 |
19 files changed, 125 insertions, 62 deletions
diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index c8d1b1064ac..78caf67bc43 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "chars"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "antifuchs"; repo = pname; rev = "v${version}"; - sha256 = "1pyda3b6svxzc98d7ggl7v9xd0xhilmpjrnajzh77zcwzq42s17l"; + sha256 = "sha256-aswosSXAh0wkO4N/y/H54dufMDrloWjpjrSWHvHR1rc="; }; - cargoSha256 = "0ywywbcnc9jm0cfd6kbq8vl6r5dl16sxn7pwi2k6l0sj75pm1i6h"; + cargoSha256 = "sha256-CqPmasdpXWjCn65G2Ua0h3v+TVP0QPFAdtKOFyoYW/0="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 42784d65a73..8b8a8a7b775 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -6,7 +6,7 @@ in buildGoModule rec { pname = "chroma"; - version = "0.9.4"; + version = "0.10.0"; # To update: # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json @@ -17,7 +17,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorSha256 = "1l5ryhwifhff41r4z1d2lifpvjcc4yi1vzrzlvkx3iy9dmxqcssl"; + vendorSha256 = "09b718vjd6npg850fr7z6srs2sc5vsr7byzlz5yb5qx0vm3ajxpf"; modRoot = "./cmd/chroma"; diff --git a/pkgs/tools/text/chroma/src.json b/pkgs/tools/text/chroma/src.json index 9bfc8d9c2c7..224bb4328d7 100644 --- a/pkgs/tools/text/chroma/src.json +++ b/pkgs/tools/text/chroma/src.json @@ -1,9 +1,9 @@ { "url": "https://github.com/alecthomas/chroma.git", - "rev": "6520148857c2ae3106ff371e527abea815b23915", - "date": "2021-10-17T08:46:20+11:00", - "path": "/nix/store/0s8a46d1nyjl3yhsgni2jz5vdv95cka8-chroma", - "sha256": "1iy6mymdjxbl5wbll1mivv7gqdyqhl6xpfqps99z307m7y38r1ni", + "rev": "36bdd4b98823bd1d7be96767cde3dd575e60b406", + "date": "2022-01-12T21:49:38+11:00", + "path": "/nix/store/951ya4wlxp217a2j3qdni29zwqfq0z7v-chroma", + "sha256": "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 364d3c6edc4..9d56e2e4c19 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "colordiff"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "daveewart"; repo = "colordiff"; rev = "v${version}"; - sha256 = "1v7s1yn0qvn08iwm5js8mxn442392qyr7s9ij506byfd497ag7qk"; + sha256 = "sha256-+TtVnUX88LMd8zmhLsKTyR9JlgR7IkUB18PF3LRgPB0="; }; nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ]; diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index c0b9c43436f..41ddcfac50a 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "0.3.12"; + version = "1.0.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1j3u9r5TjdewAyzuCwCkXl/A2yI9L/AS5QGRpz30N7U="; + sha256 = "sha256-tllwFUC+Si3PsYPmiO86D3PNdInuIxxhZW5dAuU4K14="; }; - cargoSha256 = "sha256-Z+LnWXvVfZa8Mtr9LrieqCBGxaQE1vj1joSttYM5Xhs="; + cargoSha256 = "sha256-j9CwldmxjWYVuiWfAHIV0kr5k/p1BFWHzZiVrv8m7uI="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index ee86bcd635e..729a0900f85 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,27 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.12.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-A6Z3g6fbYBynyN4OhRrZNO0ZghvT3XnIahdUQ8SE8tU="; + sha256 = "sha256-pZyQnPIdyS8XkzP9KwGKRjF21YWGgCVNeQSie9g5NcE="; }; - cargoSha256 = "sha256-6/JwrPymtpj/CXqx3Pe43v+MJTNONArU2WEo/zgJhT4="; - - postPatch = '' - pushd vendor - for grammar in */; do - if [ -d "${tree-sitter.grammars}/$grammar" ]; then - rm -r "$grammar" - ln -s "${tree-sitter.grammars}/$grammar" - fi - done - popd - ''; + cargoSha256 = "sha256-VXbCrhoGF6bCzQ02Y1LQkbEVrmIfDIKFWF9vx43tt94="; meta = with lib; { description = "A syntax-aware diff"; diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix new file mode 100644 index 00000000000..b665c182332 --- /dev/null +++ b/pkgs/tools/text/goawk/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule, fetchFromGitHub, lib }: +buildGoModule rec { + pname = "goawk"; + version = "1.16.0"; + + src = fetchFromGitHub { + owner = "benhoyt"; + repo = "goawk"; + rev = "v${version}"; + sha256 = "sha256-ALzCcSZHnzidj4tQzZWXT8WDPIE147KWbn7n1JHCTRE="; + }; + + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + # checks do not pass at the moment + doCheck = false; + + meta = with lib; { + description = "A POSIX-compliant AWK interpreter written in Go"; + homepage = "https://benhoyt.com/writings/goawk/"; + license = licenses.mit; + mainProgram = "goawk"; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/tools/text/gpt2tc/default.nix index 3714a418548..4d6ac33d61d 100644 --- a/pkgs/tools/text/gpt2tc/default.nix +++ b/pkgs/tools/text/gpt2tc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Text completion and compression using GPT-2"; - homepage = "https://bellard.org/nncp/gpt2tc.html"; + homepage = "https://bellard.org/libnc/gpt2tc.html"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ anna328p ]; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index c230278c0a0..1362591e24c 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,26 +1,38 @@ -{ - mkDerivation, lib, fetchurl, - extra-cmake-modules, kdoctools, wrapGAppsHook, - kcrash, kconfig, kinit, kparts, kiconthemes +{ mkDerivation +, lib +, fetchurl +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, boost +, kcrash +, kconfig +, kinit +, kparts +, kiconthemes }: mkDerivation rec { pname = "kdiff3"; - version = "1.8.5"; + version = "1.9.4"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vJL30E6xI/nFbb4wR69nv3FSQPqZSHrB0czypF4IVME="; + sha256 = "sha256-oTBxLO7wdN9pFCaQn8SjMrZvTD8UkKVIq1v7RjFsOFo="; }; + buildInputs = [ boost ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; + cmakeFlags = [ "-Wno-dev" ]; + meta = with lib; { + description = "Compares and merges 2 or 3 files or directories"; homepage = "https://invent.kde.org/sdk/kdiff3"; license = licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index 3a6686dba5f..c685ef60331 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -13,13 +13,13 @@ let link-grammar = stdenv.mkDerivation rec { pname = "link-grammar"; - version = "5.9.1"; + version = "5.10.2"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-4D/rqoIGlvR+q7Az8E1xPYSQQMJMRVeRM9HQIbjssLo="; + sha256 = "sha256-KM7HUuqg44l66WEzO2knRZ+Laf7+aMKqUnKYPX24abY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix new file mode 100644 index 00000000000..b37b16876b0 --- /dev/null +++ b/pkgs/tools/text/mdbook-linkcheck/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security +, testVersion, mdbook-linkcheck }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-linkcheck"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "Michael-F-Bryan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ZEOuA8W05800cnArscaGGOWTgzU6V3/wJiQcSx1MVkY="; + }; + + cargoSha256 = "sha256-EtPhbKvPHSnmPXemCzOXujlqqfdDSFaJpcZVJoHQq6U="; + + buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; + + nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ pkg-config ]; + + OPENSSL_NO_VENDOR = 1; + + doCheck = false; # tries to access network to test broken web link functionality + + passthru.tests.version = testVersion { package = mdbook-linkcheck; }; + + meta = with lib; { + description = "A backend for `mdbook` which will check your links for you."; + homepage = "https://github.com/Michael-F-Bryan/mdbook-linkcheck"; + license = licenses.mit; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 741bc652e51..05bf89e3018 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.8.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-maYFOlWNqKFmyDM2nDF25rzYnUXMlV9Ry9TMoXReUUg="; + sha256 = "sha256-dXeu/e92lafurA/bqKoszIjK/3qw/ZvVKnDxYALRpTk="; }; - cargoSha256 = "sha256-GL5Z4KfRu0zQAzVCWRIhaYtG5FrDdQabsbyFX7SjZvg="; + cargoSha256 = "sha256-LVfeQPRpwv1l3Brm8HJYoYvv26fJhsfR4I9Ds4NuWQM="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index fdf05fe2001..f6dcd72d7bf 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitea , rustPlatform , pkg-config , asciidoctor @@ -12,20 +12,21 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.25.1"; + version = "0.26.1"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = pname; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "flausch"; + repo = "mdcat"; rev = "mdcat-${version}"; - sha256 = "sha256-deG2VjyjFs0LFeTXfPYy3zzjj0rpVjxE0DhkpD5PzSQ="; + sha256 = "sha256-vB49EwQltonR9Uw8RRMZTPR4WkcylnIqiE0/8+t2R1Q="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-bPGSdXooBZMye3yj00f3rWIiW4wfg2B4meH44hpkXTY="; + cargoSha256 = "sha256-v52ob5l5HiiZZmo88D9/ldFi0170/BuPzgKIt9ctSgU="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. @@ -50,7 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "cat for markdown"; homepage = "https://github.com/lunaryorn/mdcat"; - license = with licenses; [ asl20 ]; + license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ davidtwco SuperSandro2000 ]; }; } diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix index 923dd06d182..d1cd4334e11 100644 --- a/pkgs/tools/text/patchutils/generic.nix +++ b/pkgs/tools/text/patchutils/generic.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ perl ] ++ extraBuildInputs; hardeningDisable = [ "format" ]; + # tests fail when building in parallel + enableParallelBuilding = false; + postInstall = '' for bin in $out/bin/{splitdiff,rediff,editdiff,dehtmldiff}; do wrapProgram "$bin" \ diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index ccf1abe5396..11cb4e6db07 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ruplacer"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "TankerHQ"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gme/p/F+LvfzynPNKmaPbNsKbwNKFCeEbAADk5PyMh8="; + sha256 = "sha256-5r1OywctKAeSBPzjYSPith1QNxRH0hman7lnSym2XIY="; }; - cargoSha256 = "sha256-/37TBl/FnCtkiufusPuJIpirD2WVO882xSqrfWVMNW0="; + cargoSha256 = "sha256-JrVPEuGBVo+NCsZ1DH/Af8OLWiNXnQIBxiOukw+W5Qo="; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index fcf75ed7a87..0de0f745a23 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.17"; + version = "0.4.20"; src = fetchFromGitHub { owner = "ms-jpq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dclnsncql3TFOZ4z6SyIAWe4bgAFK3Us3xJ0AeX/wNA="; + sha256 = "sha256-BhkSqXiQPOSYnCXqjAqenKx3DextxPluqsTAMI4Xs7g="; }; - cargoSha256 = "sha256-jej7JKSllBpb13Zq0WrcDPLdMtnjau8I0a4ghstHVqk="; + cargoSha256 = "sha256-aKTF0DH8Lf/H6OfQPuQ6yGOmUEUguYcHMCuYKIjNR9k="; meta = with lib; { description = "CLI tool to search and replace"; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 5757db1e871..8fc299fa6c0 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hEP7Oe1CNLEvSfUIXoXwRJUG4kIkb2f1549cZRXK+NY="; + hash = "sha256-5ZlZ/nCUOiyOWagF1Vla945d7zKbMsHp56ZE4HwdEP4="; }; buildInputs = [ diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 8303e46e463..4ed12b5b134 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.14.0"; + version = "2.15.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-4kFd2ULap9kcMu81Lu0SxER7xDAnVVyi9yAVsS1yhnw="; + sha256 = "sha256-akJgIS+jf2n9NC4A+/gNQR62BaJ6T9vvdxJggOTRHn8="; }; - vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY="; + vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index ab573dfd7a1..f535449daf1 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "8.1"; + version = "8.2"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-23SCNQpo0udPbCpuF9hxugbJQQHs4edKNX6nghu0Ges="; + sha256 = "sha256-ANs8xod8iFv81ACZM859Qn1HIVbyUConyha8rwH6rmQ="; }; buildInputs = [curl libiconv]; |