diff options
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/codesearch/default.nix | 22 | ||||
-rw-r--r-- | pkgs/tools/text/difftastic/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/mmdoc/default.nix | 37 | ||||
-rw-r--r-- | pkgs/tools/text/snippetpixie/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/tab/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/text/ugrep/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/vale/default.nix | 6 |
7 files changed, 60 insertions, 27 deletions
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 9c3e9fbd84098..40ee8c58fbcc7 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,24 +1,22 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "codesearch"; - version = "20150717-${lib.strings.substring 0 7 rev}"; - rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; + version = "1.0.0"; goPackagePath = "github.com/google/codesearch"; - src = fetchgit { - inherit rev; - url = "https://github.com/google/codesearch"; - sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; + src = fetchFromGitHub { + owner = "google"; + repo = "codesearch"; + rev = "v${version}"; + sha256 = "sha256-3kJ/JT89krbIvprWayBL4chUmT77Oa1W13UNCr4fe4k="; }; - meta = { + meta = with lib; { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; - license = [ lib.licenses.bsd3 ]; - maintainers = [ lib.maintainers.bennofs ]; - platforms = lib.platforms.unix; + license = [ licenses.bsd3 ]; + maintainers = with maintainers; [ bennofs ]; }; } diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 729a0900f8510..14c95bd2f3bf9 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.19.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-pZyQnPIdyS8XkzP9KwGKRjF21YWGgCVNeQSie9g5NcE="; + sha256 = "sha256-VV4nCR+BGly+EdCkyI4KeS0Zmn6NkfRsMs//0Sj3E20="; }; - cargoSha256 = "sha256-VXbCrhoGF6bCzQ02Y1LQkbEVrmIfDIKFWF9vx43tt94="; + cargoSha256 = "sha256-MyCi5PuUs9MJArDFaBgjjBInYJAS/SAPe1iNTs9feLY="; meta = with lib; { description = "A syntax-aware diff"; diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/tools/text/mmdoc/default.nix new file mode 100644 index 0000000000000..e30020d15d9b5 --- /dev/null +++ b/pkgs/tools/text/mmdoc/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmark-gfm +, xxd +, fastJson +, libzip +, ninja +, meson +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "mmdoc"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "ryantm"; + repo = "mmdoc"; + rev = version; + hash = "sha256-Lz2+vsXjz9BVOCI1vIrNTvZgh19OuvXEhnMw2QBZr1w="; + }; + + nativeBuildInputs = [ ninja meson pkg-config xxd ]; + + buildInputs = [ cmark-gfm fastJson libzip ]; + + doCheck = stdenv.isx86_64; + + meta = with lib; { + description = "Minimal Markdown Documentation"; + homepage = "https://github.com/ryantm/mmdoc"; + license = licenses.cc0; + maintainers = with maintainers; [ ryantm ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 7102977e8eeeb..a83135b5024d5 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -56,8 +56,6 @@ stdenv.mkDerivation rec { json-glib xorg.libXtst pantheon.granite - pantheon.elementary-gtk-theme - pantheon.elementary-icon-theme ]; doCheck = true; diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index 096e0b04c6956..18d3e3d004ad5 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromBitbucket, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - version = "8.0"; + version = "9.0"; pname = "tab"; - src = fetchFromBitbucket { - owner = "tkatchev"; + src = fetchFromGitHub { + owner = "ivan-tkatchev"; repo = pname; rev = version; - sha256 = "sha256-RcDvghTiqIdH79khwDIo8PhvmcObmix8WBrHToLwcw4="; + sha256 = "sha256-2keVGPRYV2KCeJ+LgAcl74cjW5wvp6Rmy7VNMtdliBE="; }; checkInputs = [ python3 ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 8fc299fa6c00d..7a921bdd11f57 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.7.1"; + version = "3.7.6"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - hash = "sha256-5ZlZ/nCUOiyOWagF1Vla945d7zKbMsHp56ZE4HwdEP4="; + sha256 = "sha256-fOp+nf/xZKOw8CDI1RSl/DQH52ay/M/aeSMf6MdfKmQ="; }; buildInputs = [ diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 91ac9ae2e1216..9ecd7f44cfa89 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.15.2"; + version = "2.15.3"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-4KP4/mfuHTYxOwWqHOa2RNHgElOg6YNAEFmiuF/sHa8="; + sha256 = "sha256-vhsn72xCe1wC4YRdo2m49iUj/3nVl0cyfeSmWRfESaY="; }; - vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; + vendorSha256 = "sha256-/0H35PGFFPch4jDnQ/ggctyHZJ5W/C1PNlkT5zzvI3M="; postInstall = '' mkdir -p $data/share/vale |