diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/text')
34 files changed, 330 insertions, 87 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix index 22a18b1cffb2..205efc414d59 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/amber/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "amber"; - version = "0.5.4"; + version = "0.5.8"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0pqz3spb5lmrj7w8hynmah9nrcfjsb1s0bmrr0cng9a9jx8amwzn"; + sha256 = "0j9h9zzg6n4mhq2bqj71k5db595ilbgd9dn6ygmzsm74619q4454"; }; - cargoSha256 = "1ps70swh96xbfn4hng5krlmwvw2bwrl2liqvx9v9vy6pr86643s6"; + cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/angle-grinder/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/angle-grinder/default.nix new file mode 100644 index 000000000000..a8702553c4b3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/angle-grinder/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "angle-grinder"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "rcoh"; + repo = pname; + rev = "v${version}"; + sha256 = "1m5yj9412kjlnqi1nwh44i627ip0kqcbhvwgh87gl5vgd2a0m091"; + }; + + cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8"; + + meta = with stdenv.lib; { + description = "Slice and dice logs on the command line"; + homepage = "https://github.com/rcoh/angle-grinder"; + license = licenses.mit; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/asciigraph/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/asciigraph/default.nix new file mode 100644 index 000000000000..79d8c9079c79 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/asciigraph/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "asciigraph"; + version = "0.5.1"; + + goPackagePath = "github.com/guptarohit/asciigraph"; + + src = fetchFromGitHub { + owner = "guptarohit"; + repo = pname; + rev = "v${version}"; + sha256 = "0aqf64b5d5lf9scvxdx5f3p0vvx5s59mrvr6hcjljg1prksah9ns"; + }; + + meta = with lib; { + homepage = "https://github.com/guptarohit/asciigraph"; + description = "Lightweight ASCII line graph ╭┈╯ command line app"; + license = licenses.bsd3; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/chars/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/chars/default.nix new file mode 100644 index 000000000000..fa58d110550e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/chars/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "chars"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "antifuchs"; + repo = pname; + rev = "v${version}"; + sha256 = "1pyda3b6svxzc98d7ggl7v9xd0xhilmpjrnajzh77zcwzq42s17l"; + }; + + cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "Commandline tool to display information about unicode characters"; + homepage = "https://github.com/antifuchs/chars"; + license = licenses.mit; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix index b7efe02f4cdb..b85d33d887aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.4.1"; + version = "7.4.2"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "08w6yywzirsxq8bh87jycvvw922ybhc2l426j2iqzliyn1h8mm8w"; + sha256 = "00dfsf4rfyjb5j12gan8xjiirm0asshdz6dmd3l34a7ays6wadb0"; }; nativeBuildInputs = [ perl gettext ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix index d15683894a2f..023cc58f4a6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/fastmod/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "fastmod"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; rev = "v${version}"; - sha256 = "0089a17h0wgan3fs6x1la35lzjs1pib7p81wqkh3zcwvx8ffa8z8"; + sha256 = "0nrh6h5imbpl7i0sqqm16x9ggazww5739vng1ay1v6sgbbs0a095"; }; - cargoSha256 = "02nkxjwfiljndmi0pv98chfsw9vmjzgmp5r14mchpayp4943qk9m"; + cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix index 19ef3aacc6b2..08b588691e50 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/gnugrep/default.nix @@ -5,7 +5,7 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -let version = "3.5"; in +let version = "3.6"; in stdenv.mkDerivation { pname = "gnugrep"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "0jm4hynsqf32rw1j3kv239wzg47qm6glqh6841ar9ay20xvwfamq"; + sha256 = "0gipv6bzkm1aihj0ncqpyh164xrzgcxcv9r1kwzyk2g1mzl1azk6"; }; # Perl is needed for testing diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix index 8c98a4aba465..20052f6c4cef 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/groff/default.nix @@ -82,10 +82,6 @@ stdenv.mkDerivation rec { moveToOutput bin/afmtodit $perl moveToOutput bin/gperl $perl moveToOutput bin/chem $perl - moveToOutput share/groff/${version}/font/devpdf $perl - - # idk if this is needed, but Fedora does it - moveToOutput share/groff/${version}/tmac/pdf.tmac $perl moveToOutput bin/gpinyin $perl moveToOutput lib/groff/gpinyin $perl diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac b/infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac index 8ef1040ca4a0..776a7abb1da7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/groff/site.tmac @@ -14,3 +14,6 @@ . if '\V[GROFF_SGR]'' \ . output x X tty: sgr 0 .\} +. +.ds doc-default-operating-system Nixpkgs +.ds doc-volume-operating-system Nixpkgs diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix index 5f217e69ea56..f091d867503b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/gtranslator/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.36.0"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1lxd2nkji4jk8g2xmyc1a1r3ww710ddk91zh9psmx8xlb4xivaid"; + sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix index a918770aa7b9..e4e80e694fe1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.57"; + version = "3.59"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf"; + sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb"; }; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix index 51075c2ce174..a9b9e7884021 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Jsawk is like awk, but for JSON"; + description = "Like awk, but for JSON"; homepage = "https://github.com/micha/jsawk"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix index 9921862b798e..862faadea3f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/kdiff3/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; meta = with lib; { - homepage = "http://kdiff3.sourceforge.net/"; + homepage = "https://invent.kde.org/sdk/kdiff3"; license = licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix index 0dd01d382ed0..fc0ec487ad50 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.0"; + version = "5.1"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "1jyd4z62ldwhqx9r7v4b9k4pl300wr4b7ggj4f0yjf0gpwg7l9p7"; + sha256 = "07a2cxsa04lzifphlf5mv88xpnixalmryd0blawblxsmdyhmvg3y"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix new file mode 100644 index 000000000000..8a521b751d4d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }: + +with stdenv.lib; + +let + perlDeps = with perlPackages; [ + ConfigOnion DateCalc + FileBaseDir YAMLLibYAML + GetoptLongDescriptive DateTimeFormatStrptime + StringInterpolate + ]; + +in stdenv.mkDerivation rec { + pname = "ledger2beancount"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "zacchiro"; + repo = "ledger2beancount"; + rev = version; + sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j"; + }; + + phases = [ + "unpackPhase" + "installPhase" + "fixupPhase" + ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl beancount ] ++ perlDeps; + + makeFlags = [ "prefix=$(out)" ]; + installFlags = [ "INSTALL=install" ]; + + installPhase = '' + mkdir -p $out + cp -r $src/bin $out/bin + ''; + + postFixup = '' + wrapProgram "$out/bin/ledger2beancount" \ + --set PERL5LIB "${perlPackages.makeFullPerlPath perlDeps}" + ''; + + meta = { + description = "Ledger to Beancount text-based converter"; + longDescription = '' + A script to automatically convert Ledger-based textual ledgers to Beancount ones. + + Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved. + ''; + homepage = "https://github.com/zacchiro/ledger2beancount"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pablovsky ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix index 0a5eae904736..8e0350177425 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "1566jabmvafv6aiw5nvb6y2zcnxc7pbb9dl3s4vi6mx21kqp68ag"; + sha256 = "0nqr5a27i91m71fhpycf60q54qplc920y1fmk9hav3pbb9wcc5dl"; }; - cargoSha256 = "0sa1h3qzdhgk2h3wrc0kg0ajq6zbkvn1ry4672gfn3j9gpgvy2bb"; + cargoSha256 = "1p72iwl9ca7a92nf6wyjjbn0qns0xxb4xrbz2r2nmd83cxs0fplg"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix index 277c7417ce96..c89d1526257f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -1,32 +1,47 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security, ansi2html }: +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, asciidoctor +, openssl +, Security +, ansi2html +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.21.1"; + version = "0.22.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-O7LlbSkxcyHQiTHYB/QBJVlShzTSzud3VJDIQ1ScvM4="; + hash = "sha256-4sM1xT/JQ+yM5tZkGwK7r0gUT5so9o1MnDJ7apZkRd4="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-pvhYKyFraMI4w5nq6L8qs/ONSNDTHElhZnZmD5mmAZs="; + cargoSha256 = "sha256-LoNm2/6/FgTKp95ETODY39D8Ou+9X+IXIy625YW9AFI="; checkInputs = [ ansi2html ]; - checkPhase = '' - # Skip tests that use the network and that include files. - cargo test -- \ - --skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \ - --skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \ - --skip magic::tests::detect_mimetype_of_png_image \ - --skip magic::tests::detect_mimetype_of_svg_image \ - --skip resources::tests::read_url_with_http_url_fails_when_status_404 \ - --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 \ - --skip iterm2_tests_render_md_samples_images_md + # Skip tests that use the network and that include files. + checkFlags = [ + "--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" + "--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length" + "--skip magic::tests::detect_mimetype_of_png_image" + "--skip magic::tests::detect_mimetype_of_svg_image" + "--skip resources::tests::read_url_with_http_url_fails_when_status_404" + "--skip resources::tests::read_url_with_http_url_returns_content_when_status_200" + "--skip iterm2_tests_render_md_samples_images_md" + ]; + + postInstall = '' + installManPage $releaseDir/build/mdcat-*/out/mdcat.1 + installShellCompletion --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash + installShellCompletion --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish + installShellCompletion --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix index bf082abadbce..ca71c3a1b3d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/miller/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.9.1"; + version = "5.10.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "1i9bcpfjnl2yjnfmf0ar1l62zwq01ph0yylz0dby8k2l7cvq5ci6"; + sha256 = "02jqbxnchljyqnmlbxjaf5zpdi03gxapfy38dfikl5j4f7yyxvjs"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; meta = with stdenv.lib; { - description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON"; + description = "Like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON"; homepage = "http://johnkerl.org/miller/"; license = licenses.bsd2; maintainers = with maintainers; [ mstarzyk ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix index bfa22a4fd182..1e2b76c008e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.0.1"; + version = "11.3.3"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn"; + sha256 = "0qv34clid65p11dgqalyk7b7myn5ibiz8i9xxhxkmjblw297p6ak"; }; nativeBuildInputs = with python3Packages; [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/pbgopy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/pbgopy/default.nix new file mode 100644 index 000000000000..3972d3dc9bd4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/pbgopy/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pbgopy"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "nakabonne"; + repo = pname; + rev = "v${version}"; + sha256 = "17rk15hs7kg9m1vphh1gjny7sqnk80qw61jn8qyxcmw2n55rkmfp"; + }; + + vendorSha256 = "1ak3hd979395grbns9p5sw5f45plcqq6vg7j7v8n7xqc20s2l8m9"; + + meta = with stdenv.lib; { + description = "Copy and paste between devices"; + homepage = "https://github.com/nakabonne/pbgopy"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix index 05241033c6af..1c82d8d365e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -4,20 +4,20 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; - sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w"; + sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk"; }; - nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook + nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkgconfig ]; buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; - + preConfigure = " patchShebangs bootstrap ./bootstrap @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { "--with-boost-libdir=${boost.out}/lib" "CPPFLAGS=-I${nlohmann_json}/include/nlohmann/" ]; - + preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}") ''; - + enableParallelBuilding = true; meta = with stdenv.lib; { @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar genesis ]; + maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix index b6503f888483..e8dd5c8bbf77 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/recode/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "recode"; - version = "3.7.7"; + version = "3.7.8"; # 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 = "1yrqgw74qrdmy82lxd1cxlfclrf2fqi0qp7afjmfc6b7f0xzcih9"; + sha256 = "19yg20z1smj9kag1axgvc4s4kd6jmw75h0pa8xqxl3xqqyn5rdsg"; }; nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix index d20ce99dd74e..6f484bed8bcf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, python3Packages }: -pythonPackages.buildPythonPackage rec { +let pname = "rst2html5"; - version = "1.9.4"; + version = "1.10.6"; +in python3Packages.buildPythonPackage { + inherit pname version; + format = "wheel"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-jmToDFLQODqgTycBp2J8LyoJ1Zxho9w1VdhFMzvDFkg="; }; - propagatedBuildInputs = with pythonPackages; + propagatedBuildInputs = with python3Packages; [ docutils genshi pygments beautifulsoup4 ]; - meta = with stdenv.lib;{ - homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5"; + meta = with lib;{ + homepage = "https://pypi.org/project/rst2html5/"; description = "Converts ReSTructuredText to (X)HTML5"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix index 7ebf739414a2..f4b3ed3dca4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ruplacer/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "Find and replace text in source files"; homepage = "https://github.com/TankerHQ/ruplacer"; license = [ licenses.bsd3 ]; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix index 1fa508b1ef60..66529514ec7b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/sd/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "Intuitive find & replace CLI (sed alternative)"; homepage = "https://github.com/chmln/sd"; license = licenses.mit; - maintainers = with maintainers; [ amar1729 filalex77 ]; + maintainers = with maintainers; [ amar1729 Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix index ec58cbdd1a94..705999639053 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -1,29 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, scdoc }: buildGoModule rec { pname = "shfmt"; - version = "3.1.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "03zgi0rlra3gz8cbqwmhpjxsg5048anfc6ccd2w50fjhx6farsnv"; + sha256 = "1kp4ib0a64cc9qylny48ff5q9ciklzx93yhv7fgqhl1v2c7fm1jp"; }; - vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8"; + vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29"; subPackages = [ "cmd/shfmt" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - patches = [ - # fix failing test on go 1.15, remove with > 3.1.2 - (fetchpatch { - url = "https://github.com/mvdan/sh/commit/88956f97dae1f268af6c030bf2ba60762ebb488a.patch"; - sha256 = "1zg8i7kklr12zjkaxh8djd2bzkdx8klgfj271r2wivkc2x61shgv"; - }) - ]; + nativeBuildInputs = [ installShellFiles scdoc ]; + + postBuild = '' + scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 + installManPage shfmt.1 + ''; meta = with lib; { homepage = "https://github.com/mvdan/sh"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix index 5a36de5f7202..dc025f17a78b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/sift/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "sift is a fast and powerful alternative to grep"; + description = "A fast and powerful alternative to grep"; homepage = "https://sift-tool.org"; maintainers = [ maintainers.carlsverre ]; license = licenses.gpl3; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix index 5c6025b245e0..ed35a9109a07 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "1db3fbawh4qwdqby5ji4g26pksi4q253r5zvd3kv1m2ljmwrrwj0"; + sha256 = "1cb76kzw34yr1r135lyd75ddm9v99m7i3lyirm353cdch8qspfmv"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ucg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ucg/default.nix new file mode 100644 index 000000000000..db8984536804 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ucg/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, pcre +, nixosTests +}: + +let + pname = "ucg"; + version = "20190225"; +in stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "gvansickle"; + repo = pname; + rev = "c3a67632f1e3f332bfb102f0db167f34a2e42da7"; + sha256 = "sha256-/wU1PmI4ejlv7gZzZNasgROYXFiDiIxE9BFoCo6+G5Y="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ pcre ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/gvansickle/ucg/"; + description = "Grep-like tool for searching large bodies of source code"; + longDescription = '' + UniversalCodeGrep (ucg) is an extremely fast grep-like tool specialized + for searching large bodies of source code. It is intended to be largely + command-line compatible with Ack, to some extent with ag, and where + appropriate with grep. Search patterns are specified as PCRE regexes. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; + + passthru.tests = { inherit (nixosTests) ucg; }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix index 6f44c360267f..06c8b0d3d6a9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "2.5.5"; + version = "3.0.5"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "0ba9h0m9c28rllym1djij3b97k4rj06nsgajmbxg5mpxfzplgxy2"; + sha256 = "17yrlgn18kkx7m03dr0hamv0jny6z4x6sk6an41l807i1xaqjyg6"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/uwc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/uwc/default.nix new file mode 100644 index 000000000000..cf8e5658f764 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/uwc/default.nix @@ -0,0 +1,24 @@ +{ rustPlatform, lib, fetchFromGitLab }: + +rustPlatform.buildRustPackage rec { + pname = "uwc"; + version = "1.0.4"; + + src = fetchFromGitLab { + owner = "dead10ck"; + repo = pname; + rev = "v${version}"; + sha256 = "1ywqq9hrrm3frvd2sswknxygjlxi195kcy7g7phwq63j7hkyrn50"; + }; + + cargoSha256 = "0ra62cf75b1c4knxxpbdg8m0sy2k02r52j606fp5l9crp0fml8l0"; + + doCheck = true; + + meta = with lib; { + description = "Like wc, but unicode-aware, and with per-line mode"; + homepage = "https://gitlab.com/dead10ck/uwc"; + license = licenses.mit; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix index 8a63d82eacb2..893f54eedc6e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.3.4"; + version = "2.6.4"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0vk7kk2a2891vm46lss8q2893n2zdirlicac2f3xfkrbb5lhkicd"; + sha256 = "192w98ghfldxamkx717wqa4v3lsr2imlf8xd6ygjpgx78b5zvvcx"; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix index 12880b2e4eca..a2ac4b51001a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/vgrep/default.nix @@ -1,20 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, go-md2man, installShellFiles }: buildGoModule rec { pname = "vgrep"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "vrothberg"; repo = pname; rev = "v${version}"; - sha256 = "109j04my2xib8m52a0337996a27nvfgzackpg20zs3nzn66dmvb7"; + sha256 = "06rnmg6ljj4f1g602wdp2wy9v0m1m0sj6jl6wywyjl8grjqc3vac"; }; vendorSha256 = null; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postBuild = '' + sed -i '/SHELL= /d' Makefile + make docs + installManPage docs/*.[1-9] + ''; + meta = with lib; { description = "User-friendly pager for grep/git-grep/ripgrep"; homepage = "https://github.com/vrothberg/vgrep"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 52991bb3924b..45c9eb4866ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Remove Windows batch files (unclutter $out/bin) rm ./bin/*.bat - mkdir -p $out/share/basex" "$out/share/applications" + mkdir -p "$out/share/basex" "$out/share/applications" cp -R bin etc lib webapp src BaseX.jar "$out" cp -R readme.txt webapp "$out/share/basex" |