diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/text')
19 files changed, 122 insertions, 28 deletions
diff --git a/nixpkgs/pkgs/tools/text/asciigraph/default.nix b/nixpkgs/pkgs/tools/text/asciigraph/default.nix index 27c2a1ff28ec..5cfa00d5326f 100644 --- a/nixpkgs/pkgs/tools/text/asciigraph/default.nix +++ b/nixpkgs/pkgs/tools/text/asciigraph/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "asciigraph"; - version = "0.5.2"; + version = "0.5.3"; goPackagePath = "github.com/guptarohit/asciigraph"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "guptarohit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iVgJtxt0B6nMA3bieZ1CmZucwLMb5av6Wn5BMDRWfcI="; + sha256 = "sha256-GzFJT4LI1QZzghs9g2A+pqkTg68XC+m9F14rYpMxEXM="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/text/colordiff/default.nix b/nixpkgs/pkgs/tools/text/colordiff/default.nix index 9d56e2e4c192..a7e8293851b9 100644 --- a/nixpkgs/pkgs/tools/text/colordiff/default.nix +++ b/nixpkgs/pkgs/tools/text/colordiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto }: +{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto, diffutils }: stdenv.mkDerivation rec { pname = "colordiff"; @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace 'TMPDIR=colordiff-''${VERSION}' "" + + substituteInPlace colordiff.pl \ + --replace '= "diff";' '= "${diffutils}/bin/diff";' ''; installFlags = [ diff --git a/nixpkgs/pkgs/tools/text/diffr/default.nix b/nixpkgs/pkgs/tools/text/diffr/default.nix index a77a5dc081e8..85d78ffb7329 100644 --- a/nixpkgs/pkgs/tools/text/diffr/default.nix +++ b/nixpkgs/pkgs/tools/text/diffr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "diffr"; - version = "v0.1.4"; + version = "0.1.4"; src = fetchFromGitHub { owner = "mookid"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; }; - cargoSha256 = "05rfjangmyvmqm0bvl4bcvc7m4zhg66gknh85sxr3bzrlwzacwgw"; + cargoSha256 = "0pn3vqv13n29h8069a38306vjlzlxf1m08ldv7lpzgqxhl8an00r"; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/nixpkgs/pkgs/tools/text/dirdiff/default.nix b/nixpkgs/pkgs/tools/text/dirdiff/default.nix index e0385d332450..3577242fc0e9 100644 --- a/nixpkgs/pkgs/tools/text/dirdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/dirdiff/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { desktopName = "Dirdiff"; genericName = "Directory Diff Viewer"; comment = "Diff and merge directory trees"; - categories = "Development;"; + categories = [ "Development" ]; }) ]; diff --git a/nixpkgs/pkgs/tools/text/gawk/default.nix b/nixpkgs/pkgs/tools/text/gawk/default.nix index d66d3763c036..3f91a301fd1b 100644 --- a/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -16,7 +16,7 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; stdenv.mkDerivation rec { - pname = "gawk"; + pname = "gawk" + lib.optionalString interactive "-interactive"; version = "5.1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/hottext/default.nix b/nixpkgs/pkgs/tools/text/hottext/default.nix index 5472c8a36cf5..f6c70013b4ce 100644 --- a/nixpkgs/pkgs/tools/text/hottext/default.nix +++ b/nixpkgs/pkgs/tools/text/hottext/default.nix @@ -19,7 +19,7 @@ nimPackages.buildNimPackage rec { HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; desktopItem = makeDesktopItem { - categories = "Utility;"; + categories = [ "Utility" ]; comment = meta.description; desktopName = pname; exec = pname; diff --git a/nixpkgs/pkgs/tools/text/igrep/default.nix b/nixpkgs/pkgs/tools/text/igrep/default.nix new file mode 100644 index 000000000000..b7fc915c44d7 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/igrep/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, Security +, testVersion +, igrep +}: + +rustPlatform.buildRustPackage rec { + pname = "igrep"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "konradsz"; + repo = "igrep"; + rev = "v${version}"; + sha256 = "sha256-CH0wf9EhNnfi93W/4IJf6bPqU4pgw6Q9965Wjln9pso="; + }; + + cargoSha256 = "sha256-VnZuRLBt/Q+D89+jKm0rak+ID5oNbvN1k8or3pYzfIM="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + passthru.tests = { + version = testVersion { package = igrep; command = "ig --version"; }; + }; + + meta = with lib; { + description = "Interactive Grep"; + homepage = "https://github.com/konradsz/igrep"; + changelog = "https://github.com/konradsz/igrep/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/nixpkgs/pkgs/tools/text/kdiff3/default.nix index 1362591e24c1..07f82c08591a 100644 --- a/nixpkgs/pkgs/tools/text/kdiff3/default.nix +++ b/nixpkgs/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oTBxLO7wdN9pFCaQn8SjMrZvTD8UkKVIq1v7RjFsOFo="; + sha256 = "sha256-CDchWW2dQ3O8LxKYOUqN21tVp61NckKTOnzYrmRoPBo="; }; buildInputs = [ boost ]; diff --git a/nixpkgs/pkgs/tools/text/mark/default.nix b/nixpkgs/pkgs/tools/text/mark/default.nix index 5e4bd7becc52..9c7f4e2b385d 100644 --- a/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "6.7"; + version = "8.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-ZPKYZbWrR69V4SkXTiAK59Q2xpxkOC6KyAuspjzERwQ="; + sha256 = "sha256-1cJt/+OClc7YxSy9kGLQrREckjDvMIBdzet9SJGPb84="; }; - vendorSha256 = "sha256-Yp47FBS8JN/idBfZG0z0f2A1bzob8KTPtZ7u0cNCrM8="; + vendorSha256 = "sha256-a+pWSt24+aNABcLhiiFy+g/imBQtiqliAAWWkjPolxU="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/text/pru/Gemfile b/nixpkgs/pkgs/tools/text/pru/Gemfile new file mode 100644 index 000000000000..84e6742401e7 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/pru/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'pru' diff --git a/nixpkgs/pkgs/tools/text/pru/Gemfile.lock b/nixpkgs/pkgs/tools/text/pru/Gemfile.lock new file mode 100644 index 000000000000..98a00ad5368b --- /dev/null +++ b/nixpkgs/pkgs/tools/text/pru/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + pru (0.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + pru + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/tools/text/pru/default.nix b/nixpkgs/pkgs/tools/text/pru/default.nix new file mode 100644 index 000000000000..26e743442486 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/pru/default.nix @@ -0,0 +1,24 @@ +{ lib +, bundlerApp +, bundlerUpdateScript +}: + +bundlerApp rec { + pname = "pru"; + gemdir = ./.; + exes = [ "pru" ]; + + meta = with lib; { + homepage = "https://github.com/grosser/pru"; + description = "Pipeable Ruby"; + longDescription = '' + pru allows to use Ruby scripts as filters, working as a convenient, + higher-level replacement of typical text processing tools (like sed, awk, + grep etc.). + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; + + passthru.updateScript = bundlerUpdateScript pname; +} diff --git a/nixpkgs/pkgs/tools/text/pru/gemset.nix b/nixpkgs/pkgs/tools/text/pru/gemset.nix new file mode 100644 index 000000000000..76d469ef1b72 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/pru/gemset.nix @@ -0,0 +1,12 @@ +{ + pru = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1imavf7wlbdfxvkrf838pp3cyfib0r7nzv0chnhyxagy1kk969r2"; + type = "gem"; + }; + version = "0.2.1"; + }; +} diff --git a/nixpkgs/pkgs/tools/text/recode/default.nix b/nixpkgs/pkgs/tools/text/recode/default.nix index ce377fada9f3..8c49fb5ee7fc 100644 --- a/nixpkgs/pkgs/tools/text/recode/default.nix +++ b/nixpkgs/pkgs/tools/text/recode/default.nix @@ -2,24 +2,27 @@ stdenv.mkDerivation rec { pname = "recode"; - version = "3.7.9"; + version = "3.7.12"; # Use official tarball, avoid need to bootstrap/generate build system src = fetchurl { url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-5DIKaw9c2DfNtFT7WFQBjd+pcJEWCOHwHMLGX2M2csQ="; + hash = "sha256-TbHJB28E26oVlyb1AAhH5eWoOuyOXGT4ygQ4P2zaEtU="; }; nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ]; buildInputs = [ libintl ]; + enableParallelBuilding = true; + doCheck = true; meta = { homepage = "https://github.com/rrthomas/recode"; description = "Converts files between various character sets and usages"; + changelog = "https://github.com/rrthomas/recode/raw/v${version}/NEWS"; platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; + license = with lib.licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/nixpkgs/pkgs/tools/text/rosie/default.nix b/nixpkgs/pkgs/tools/text/rosie/default.nix index 4f70f972b683..a4edf55f7504 100644 --- a/nixpkgs/pkgs/tools/text/rosie/default.nix +++ b/nixpkgs/pkgs/tools/text/rosie/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchgit , libbsd , readline @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { pname = "rosie"; version = "unstable-2020-01-11"; + src = fetchgit { url = "https://gitlab.com/rosie-pattern-language/rosie"; rev = "670e9027563609ba2ea31e14e2621a1302742795"; diff --git a/nixpkgs/pkgs/tools/text/ruplacer/default.nix b/nixpkgs/pkgs/tools/text/ruplacer/default.nix index 11cb4e6db075..c882e046c3d5 100644 --- a/nixpkgs/pkgs/tools/text/ruplacer/default.nix +++ b/nixpkgs/pkgs/tools/text/ruplacer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ruplacer"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "TankerHQ"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5r1OywctKAeSBPzjYSPith1QNxRH0hman7lnSym2XIY="; + sha256 = "sha256-jLGstlEqABT4ejdYlTQZaBVeYy86+lqIilyufPGIZyQ="; }; - cargoSha256 = "sha256-JrVPEuGBVo+NCsZ1DH/Af8OLWiNXnQIBxiOukw+W5Qo="; + cargoSha256 = "sha256-cv+g68WQvnnd0qZDB9PfZLbsdrM+RXs27a0Q5YPiHDQ="; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/nixpkgs/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix index 4ed12b5b1344..91ac9ae2e121 100644 --- a/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.15.1"; + version = "2.15.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-akJgIS+jf2n9NC4A+/gNQR62BaJ6T9vvdxJggOTRHn8="; + sha256 = "sha256-4KP4/mfuHTYxOwWqHOa2RNHgElOg6YNAEFmiuF/sHa8="; }; vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; diff --git a/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 92fde60c23c0..4d6d23054da1 100644 --- a/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { comment = "Visually query and analyse your XML data"; desktopName = "BaseX XML Database"; genericName = "XML database tool"; - categories = "Development;Utility;Database"; - mimeType = "text/xml"; + categories = [ "Development" "Utility" "Database" ]; + mimeTypes = [ "text/xml" ]; }); dontBuild = true; diff --git a/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix b/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix index f535449daf1d..f1ab390e481b 100644 --- a/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "8.2"; + version = "8.3"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-ANs8xod8iFv81ACZM859Qn1HIVbyUConyha8rwH6rmQ="; + sha256 = "sha256-pQxNFtrWYK1nku9TvHfvqdVyl5diN3Gj/OUtjiPT0Iw="; }; buildInputs = [curl libiconv]; |