diff options
Diffstat (limited to 'pkgs/tools/text')
76 files changed, 261 insertions, 391 deletions
diff --git a/pkgs/tools/text/anewer/default.nix b/pkgs/tools/text/anewer/default.nix index 69c4eb39b3511..009a6264fddde 100644 --- a/pkgs/tools/text/anewer/default.nix +++ b/pkgs/tools/text/anewer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d"; }; - cargoSha256 = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM="; + cargoHash = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM="; meta = with lib; { description = "Append lines from stdin to a file if they don't already exist in the file"; diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix index 0da6b7e872973..46166d8c6370a 100644 --- a/pkgs/tools/text/asciigraph/default.nix +++ b/pkgs/tools/text/asciigraph/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "asciigraph"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "guptarohit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pCfjk8ViMY2iAus2/hibSZXgKY9YBFRH3vsD19MTJ+8="; + sha256 = "sha256-Y+RRFFCeuDjzTznpfC7Wn3j96ZCFSOzvb8ND/ATW+JI="; }; vendorHash = null; diff --git a/pkgs/tools/text/autocorrect/default.nix b/pkgs/tools/text/autocorrect/default.nix index 19e69a468ffd6..60e5608274eb0 100644 --- a/pkgs/tools/text/autocorrect/default.nix +++ b/pkgs/tools/text/autocorrect/default.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://huacnlee.github.io/autocorrect"; changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${version}"; license = licenses.mit; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 38d1ba5e06e4b..1fdaf78a6769d 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = with maintainers; []; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index c3afeb492280f..da333cd6c39cb 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-yW1quDyQn2xhrlhhPj9DKq7g8LlYKvEKDFj3xSagRTU="; }; - cargoSha256 = "sha256-0INC0LFzlnFnt5pCiU4xePxU8a6GiU1L8bg7zcuFl2k="; + cargoHash = "sha256-0INC0LFzlnFnt5pCiU4xePxU8a6GiU1L8bg7zcuFl2k="; meta = with lib; { description = "Human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index d5685a9c56c7c..5359e811553d4 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-7KyQUnl2O/raQLcP5VsMCX3084Mn6HFfxjJmksAkWBc="; + hash = "sha256-EpRGEn+cteFt4tn70bycIrIIjk+ZUO2n5SK14Hc2Qq0="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 1aa63333d89c1..172963858e25b 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 = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ci0PyTZJIEagBCymtrYR/ntgYym1aGKNX4COfrE99mY="; + sha256 = "sha256-9rjrNxMUUuH3S6fVsooscgIP+oFeQ6/gBQmuUMPDfp0="; }; - cargoHash = "sha256-/pswnb2vNtw8zSoWuC7oZPJ4yxVuy1c4ES1NUHhnG6I="; + cargoHash = "sha256-/0jviI91y4eAJ0uZDQqnw9htcl+j0aybY0U5gCc9DFg="; meta = with lib; { description = "High performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 8a66411022694..8e0f8f7a8d6dc 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "d2"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yEYdFpIIY+nAaeMPEwgz0th2rf67LeYK19Ov9QB/7J0="; + hash = "sha256-SAejVwqTa/yV1pAIltAkX25KxITfkbzP9SGcLQdPUCg="; }; vendorHash = "sha256-aoc8KSznkWJpn0Ye7FUOH5sNQ4fslIGJhIaQdGrwcqQ="; diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/tools/text/difftastic/Cargo.lock index b9d4208b8e38b..2620b6b0993b2 100644 --- a/pkgs/tools/text/difftastic/Cargo.lock +++ b/pkgs/tools/text/difftastic/Cargo.lock @@ -79,7 +79,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata", "serde", ] @@ -91,9 +91,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "cc" -version = "1.0.90" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" [[package]] name = "cfg-if" @@ -211,7 +211,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.58.0" +version = "0.60.0" dependencies = [ "assert_cmd", "bumpalo", @@ -329,8 +329,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-automata", + "regex-syntax", ] [[package]] @@ -486,9 +486,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -747,25 +747,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.9", - "regex-syntax 0.7.5", -] - -[[package]] -name = "regex-automata" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.5", + "regex-automata", + "regex-syntax", ] [[package]] @@ -776,26 +765,20 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 5b14aa3225827..e8e333cc65391 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -17,16 +17,18 @@ let in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.58.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-PTc8/NhWsLcKJj+9ebV/YaWEmyOWKJCYUjmVbr4z2SY="; + hash = "sha256-eIHwmSCAY9Fn9Du7DJxZyGqJ3SUEyZ6VEtwxphGnSHw="; }; - cargoLock.lockFile = ./Cargo.lock; + cargoLock = { + lockFile = ./Cargo.lock; + }; # skip flaky tests checkFlags = [ diff --git a/pkgs/tools/text/each/default.nix b/pkgs/tools/text/each/default.nix index 6f24ee66fe409..688a9adf88473 100644 --- a/pkgs/tools/text/each/default.nix +++ b/pkgs/tools/text/each/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I="; }; - cargoSha256 = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE="; + cargoHash = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE="; meta = with lib; { description = " A better way of working with structured data on the command line"; diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix index abbeb29234da1..2b7b2a427f6b4 100644 --- a/pkgs/tools/text/esh/default.nix +++ b/pkgs/tools/text/esh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell, binlore, esh }: stdenv.mkDerivation rec { pname = "esh"; @@ -30,6 +30,14 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; + # working around a bug in file. Was fixed in + # file 5.41-5.43 but regressed in 5.44+ + # see https://bugs.astron.com/view.php?id=276 + # "can" verdict because of `-s SHELL` arg + passthru.binlore.out = binlore.synthesize esh '' + execer can bin/esh + ''; + meta = with lib; { description = "Simple templating engine based on shell"; mainProgram = "esh"; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 9aee49e391d9f..ffdd96058139d 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "fanficfare"; - version = "4.35.0"; + version = "4.37.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hPBURlsrr/7c26YFZo5UT7PTs8s+D8BXxjU/uposHjQ="; + hash = "sha256-Wh/eWseR+SSVYUqNG6krYCgS1gipSJGTJ+fi6uZNCO8="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/tools/text/frawk/default.nix index 2b9f2e0beaa8e..bec04f7db3d56 100644 --- a/pkgs/tools/text/frawk/default.nix +++ b/pkgs/tools/text/frawk/default.nix @@ -6,7 +6,6 @@ , zlib , features ? [ "default" ] , llvmPackages_12 -, stdenv }: rustPlatform.buildRustPackage rec { @@ -15,10 +14,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA="; + hash = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA="; }; - cargoSha256 = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs="; + cargoHash = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs="; buildInputs = [ libxml2 ncurses zlib ]; diff --git a/pkgs/tools/text/frogmouth/default.nix b/pkgs/tools/text/frogmouth/default.nix index b2551b6387d68..8a93e86be66ca 100644 --- a/pkgs/tools/text/frogmouth/default.nix +++ b/pkgs/tools/text/frogmouth/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.poetry-core - python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/tools/text/fst/default.nix index 0ad2075de08fc..1f1b2950e160d 100644 --- a/pkgs/tools/text/fst/default.nix +++ b/pkgs/tools/text/fst/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "fst-bin"; - sha256 = "sha256-x2rvLMOhatMWU2u5GAdpYy2uuwZLi3apoE6aaTF+M1g="; + hash = "sha256-x2rvLMOhatMWU2u5GAdpYy2uuwZLi3apoE6aaTF+M1g="; }; cargoHash = "sha256-yTbEaw+BbjVks3j7/b75kGoUjVftLaVYvYIdI/bbfdk="; diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix deleted file mode 100644 index d2676b379970e..0000000000000 --- a/pkgs/tools/text/gist/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ buildRubyGem, lib, ruby }: - -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "gist"; - version = "6.0.0"; - source.sha256 = "0qnd1jqd7b04871v4l73grcmi7c0pivm8nsfrqvwivm4n4b3c2hd"; - - meta = with lib; { - description = "Upload code to https://gist.github.com (or github enterprise)"; - homepage = "http://defunkt.io/gist/"; - license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; - platforms = ruby.meta.platforms; - }; -} diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 5217451a984be..4a8e0d7a916ff 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,29 +1,25 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "grin"; - version = "1.3.0"; + version = "1.3.0-unstable-2023-08-30"; namePrefix = ""; + pyproject = true; src = fetchFromGitHub { owner = "matthew-brett"; - repo = pname; - rev = "1.3.0"; - hash = "sha256-exKUy7LaDtpq0rJLSuNYsIcynpB4QLtLIE6T/ncB7RQ="; + repo = "grin"; + rev = "00e11ebf17bbb37dc33d282eac1282c0bcc07e82"; + hash = "sha256-0lrCOXFb2v0hCxWd9O7ysbn8CjPd8NHOJhARYzJJcYg="; }; - patches = [ - # https://github.com/matthew-brett/grin/pull/4 - (fetchpatch { - name = "replace-nose-with-nose3.patch"; - url = "https://github.com/matthew-brett/grin/commit/ba473fa4f5da1b337ee80d7d31772a4e41ffa62d.patch"; - hash = "sha256-CnWHynKSsXYjSsTLdPuwpcIndrCdq3cQYS8teg5EM0A="; - }) - ]; + build-system = [ python3Packages.setuptools ]; - nativeCheckInputs = with python3Packages; [ - nose3 - ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = { homepage = "https://github.com/matthew-brett/grin"; diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index 1a8238059e4f1..00adbdc6288b6 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - hash = "sha256-L/jad3T89VFub0JBC/o/xc4RI+/tF0hbhZdSxmSs+lo="; + hash = "sha256-7a+gNnxr/OiM5MynOxOQ3hAprog7eAAZnMvi+5/gMzg="; }; - cargoHash = "sha256-9v3yZNKBZ0XQkA7J50GH/Z4JQUQ48HnjNXr90ZBHXgI="; + cargoHash = "sha256-rGKD09YV+QqzZ1n6gYerjbpTr+4KJ5UzynDDRw5rnP0="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/text/hcledit/default.nix b/pkgs/tools/text/hcledit/default.nix index 86c1e226fd0e9..9c48e5c6729ef 100644 --- a/pkgs/tools/text/hcledit/default.nix +++ b/pkgs/tools/text/hcledit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hcledit"; - version = "0.2.11"; + version = "0.2.13"; src = fetchFromGitHub { owner = "minamijoyo"; repo = pname; rev = "v${version}"; - hash = "sha256-UtZ59S8Cn29HNE9UpmJFtPkB8TMpDUOzlLMf78a+Vd4="; + hash = "sha256-AKNvbvRfy5QpbR1WLBlf4YcbTdX9rTGS/bovDWQXYZo="; }; - vendorHash = "sha256-huDM8kPA6vQcoJTxiWzVFZKHrTKw1ip32hMZJYZM0og="; + vendorHash = "sha256-G6jmdosQHBA+n7MgVAlzdSTqPYb5d+k4b4EzAI384FQ="; meta = with lib; { description = "Command line editor for HCL"; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 312c849214995..a2f91efc9494e 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -9,7 +9,7 @@ let owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "sha256-TFMU9owxBGrrbatk7Jj9xP8OEJNjXnjbwnW6Xq34awI="; + hash = "sha256-TFMU9owxBGrrbatk7Jj9xP8OEJNjXnjbwnW6Xq34awI="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/text/huniq/default.nix b/pkgs/tools/text/huniq/default.nix index 3bb1252ae0c69..857bbb77e3d4d 100644 --- a/pkgs/tools/text/huniq/default.nix +++ b/pkgs/tools/text/huniq/default.nix @@ -6,10 +6,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE="; + hash = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE="; }; - cargoSha256 = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ="; + cargoHash = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ="; meta = with lib; { description = "Command line utility to remove duplicates from the given input"; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 1ab884b12d4db..0b35b5779a3b5 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.psfl; }; } diff --git a/pkgs/tools/text/jotdown/default.nix b/pkgs/tools/text/jotdown/default.nix index c3b61b4f739bf..42cadf6d9447f 100644 --- a/pkgs/tools/text/jotdown/default.nix +++ b/pkgs/tools/text/jotdown/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jotdown"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hellux"; repo = "jotdown"; rev = version; - hash = "sha256-Q1BjmcA5otOkeEe8KQiqKGKHSeGntj+ktcNMrdbGHZI="; + hash = "sha256-qFx87AVGi42OCFCvksgiLh+NkXNgzfPxjcP0zDeC1is="; }; - cargoHash = "sha256-bkMJ7ApM+GsshwIFuYsH19CnU6ebq0GfwQvVp9QD46A="; + cargoHash = "sha256-IsUlTSv2QcO67FpN0eAK1gKLJelr9sfX8DefcmzHbcc="; meta = with lib; { description = "Minimal Djot CLI"; diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix deleted file mode 100644 index 9547e65dc43d5..0000000000000 --- a/pkgs/tools/text/jsawk/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, spidermonkey_102 }: - -stdenv.mkDerivation { - pname = "jsawk"; - version = "1.5-pre"; - src = fetchFromGitHub { - owner = "micha"; - repo = "jsawk"; - rev = "5a14c4af3c7b59807701b70a954ecefc6f77e978"; - sha256 = "0z3vdr3c8nvdrrxkjv9b4xg47mdb2hsknxpimw6shgwbigihapyr"; - }; - dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p $out/bin - cp $src/jsawk $out/bin/ - wrapProgram $out/bin/jsawk \ - --prefix PATH : "${spidermonkey_102}/bin" - ''; - - meta = { - description = "Like awk, but for JSON"; - mainProgram = "jsawk"; - homepage = "https://github.com/micha/jsawk"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ puffnfresh ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 456b2c568d820..f322a6f7d7c34 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-MPFKWrbg1VEWgpF42CdlTDDoQhwE/pcA085npTCEYpg="; + hash = "sha256-kYU3dcP6qVIkaOwSPNbedGYqy21RFkdZlqyk3Cw778g="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix index eda1060320c80..1772f9d1e3058 100644 --- a/pkgs/tools/text/languagetool-rust/default.nix +++ b/pkgs/tools/text/languagetool-rust/default.nix @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_words_delete" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ltrs \ --bash <($out/bin/ltrs completions bash) \ --fish <($out/bin/ltrs completions fish) \ diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index 3528a054b2914..459cc77243dc5 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; mainProgram = "mairix"; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index 8aaa5c09b6706..e640d32c55ed2 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,19 +2,29 @@ buildGoModule rec { pname = "mark"; - version = "9.1.4"; + version = "10.0.1"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-nAgEegtRT4c2wJzVOY41JgM/JVW5xQjRnhXUzjwqxLY="; + sha256 = "sha256-i1luJsAADk7VqrZAqnI52XGrbWeNLBMnzW0wxEO5LXQ="; }; - vendorHash = "sha256-2rEwZffM+RK0baz8m+fXN2NGYskv4zO67cWC4rx+hfI="; + vendorHash = "sha256-g8KN8M1jB4lTjXNfTw6gnjTCN4HDBTqtNS6c+5tJQv4="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + checkFlags = + let + skippedTests = [ + # Expects to be able to launch google-chrome + "TestExtractMermaidImage" + ]; + in [ + "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" + ]; + meta = with lib; { description = "Tool for syncing your markdown documentation with Atlassian Confluence pages"; mainProgram = "mark"; diff --git a/pkgs/tools/text/markdownlint-cli2/default.nix b/pkgs/tools/text/markdownlint-cli2/default.nix index 7ffacaa08db75..d98d3a9f29c6d 100644 --- a/pkgs/tools/text/markdownlint-cli2/default.nix +++ b/pkgs/tools/text/markdownlint-cli2/default.nix @@ -1,32 +1,57 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + stdenvNoCC, + fetchurl, + makeWrapper, + markdownlint-cli2, + nodejs, + runCommand, + zstd, }: -buildNpmPackage rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "markdownlint-cli2"; - version = "0.9.0"; + version = "0.13.0"; - src = fetchFromGitHub { - owner = "DavidAnson"; - repo = "markdownlint-cli2"; - rev = "v${version}"; - hash = "sha256-qtdR7Rhz+HLZJX82OrN+twOsvFOv99e4BBDVV1UayPI="; + # upstream is not interested in including package-lock.json in the source + # https://github.com/DavidAnson/markdownlint-cli2/issues/198#issuecomment-1690529976 + # see also https://github.com/DavidAnson/markdownlint-cli2/issues/186 + # so use the tarball from the archlinux mirror + src = fetchurl { + url = "https://us.mirrors.cicku.me/archlinux/extra/os/x86_64/markdownlint-cli2-${finalAttrs.version}-1-any.pkg.tar.zst"; + hash = "sha256-ioSVse3fS6n2wauZ0VsF6TQKy/ZsyLACQ4anNybIe+I="; }; - npmDepsHash = "sha256-Fx0lDcvzLRVSAX0apKmu1CBfnGmGQR9FQEdhHUtue/c="; + nativeBuildInputs = [ + makeWrapper + zstd + ]; - postPatch = '' - ln -s npm-shrinkwrap.json package-lock.json + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r lib share $out + makeWrapper "${lib.getExe nodejs}" "$out/bin/markdownlint-cli2" \ + --add-flags "$out/lib/node_modules/markdownlint-cli2/markdownlint-cli2.js" + + runHook postInstall ''; - dontNpmBuild = true; + passthru.tests = { + smoke = runCommand "${finalAttrs.pname}-test" { nativeBuildInputs = [ markdownlint-cli2 ]; } '' + markdownlint-cli2 ${markdownlint-cli2}/share/doc/markdownlint-cli2/README.md > $out + ''; + }; meta = { - changelog = "https://github.com/DavidAnson/markdownlint-cli2/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/DavidAnson/markdownlint-cli2/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the markdownlint library"; homepage = "https://github.com/DavidAnson/markdownlint-cli2"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "markdownlint-cli2"; }; -} +}) diff --git a/pkgs/tools/text/mdbook-d2/default.nix b/pkgs/tools/text/mdbook-d2/default.nix deleted file mode 100644 index 61176e2020201..0000000000000 --- a/pkgs/tools/text/mdbook-d2/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "mdbook-d2"; - version = "unstable-2023-03-30"; - - src = fetchFromGitHub { - owner = "danieleades"; - repo = "mdbook-d2"; - rev = "93f3037ad9730d134c929cfc90d9bd592a48a1a9"; - hash = "sha256-cmmOmJHARIBCQQEsffnBh4nc2XEDPBzLPcCrOwfTKS8="; - }; - - cargoHash = "sha256-ACwEWK5upeRLo7HU+1kKunecnEeZm0ufUaQjJkXM/4I="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - - meta = with lib; { - description = "D2 diagram generator plugin for MdBook"; - mainProgram = "mdbook-d2"; - homepage = "https://github.com/danieleades/mdbook-d2"; - changelog = "https://github.com/danieleades/mdbook-d2/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ blaggacao matthiasbeyer ]; - }; -} diff --git a/pkgs/tools/text/mdbook-footnote/default.nix b/pkgs/tools/text/mdbook-footnote/default.nix index 7beeb3e33c635..1b3ad02e5c7f6 100644 --- a/pkgs/tools/text/mdbook-footnote/default.nix +++ b/pkgs/tools/text/mdbook-footnote/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses="; }; - cargoSha256 = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc="; + cargoHash = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 9dc9f1df0e021..19719ac504d72 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-graphviz"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "dylanowen"; repo = pname; rev = "v${version}"; - hash = "sha256-myASia/nkZmAf00lZ357Sh3YV73pCBrZAIRhSzFkZa0="; + hash = "sha256-QLgTUQWfGoUV7L+nZKyO7yBYFi8/puikWkmDHQihc50="; }; - cargoHash = "sha256-UB/l+rcVHkrHv/fybDy/UjrJbVksWgt9JRQC118/kGM="; + cargoHash = "sha256-cMCNZ8Ezp7bFx4EnuZCXhqoaE0yN3iK9KnCYBYGPHKc="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/pkgs/tools/text/mdbook-i18n-helpers/default.nix index f9343e1637981..83d81f1f63897 100644 --- a/pkgs/tools/text/mdbook-i18n-helpers/default.nix +++ b/pkgs/tools/text/mdbook-i18n-helpers/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-i18n-helpers"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "google"; repo = "mdbook-i18n-helpers"; # TODO fix once upstream uses semver for tags again rev = "refs/tags/mdbook-i18n-helpers-${version}"; - hash = "sha256-nIavOBWPyCmCLwPcDbjjG1sa71HObGnhms9sSCAR2iA="; + hash = "sha256-FdguzuYpMl6i1dvoPNE1Bk+GTmeTrqLUY/sVRsbETtU="; }; - cargoHash = "sha256-bBUgsZHvJPwsdM3DjhaoAvIkPXQ6gzPOdfcE5rAnMQk="; + cargoHash = "sha256-sPRylKXTSkVkhDvpAvHuYIr9TSi1ustIs1HTwEIbk/w="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix index 878b93b055de0..7129cdd0442c0 100644 --- a/pkgs/tools/text/mdbook-linkcheck/default.nix +++ b/pkgs/tools/text/mdbook-linkcheck/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00="; }; - cargoSha256 = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4="; + cargoHash = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4="; buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix deleted file mode 100644 index 4939cfc626239..0000000000000 --- a/pkgs/tools/text/mdbook/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nix, rustPlatform, CoreServices, installShellFiles }: - -rustPlatform.buildRustPackage rec { - pname = "mdbook"; - version = "0.4.37"; - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = "mdBook"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-A8ZSqIG+rGKwggs9ogvbMIi9gClFKe8gS6D5W426ebc="; - }; - - cargoHash = "sha256-8GQM4pHiFbyoRkOx3SXuIV118ndzL+O+eA+Gd2jbsdI="; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd mdbook \ - --bash <($out/bin/mdbook completions bash) \ - --fish <($out/bin/mdbook completions fish) \ - --zsh <($out/bin/mdbook completions zsh ) - ''; - - passthru = { - tests = { - inherit nix; - }; - }; - - meta = with lib; { - description = "Create books from MarkDown"; - mainProgram = "mdbook"; - homepage = "https://github.com/rust-lang/mdBook"; - changelog = "https://github.com/rust-lang/mdBook/blob/v${version}/CHANGELOG.md"; - license = [ licenses.mpl20 ]; - maintainers = with maintainers; [ havvy Frostman matthiasbeyer ]; - }; -} diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index a928b74a15188..89348e1ea6b11 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.1.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - hash = "sha256-qdNORp9THxHWR95uVcYtCy59OQqdop1012thZN5i64w="; + hash = "sha256-Geq4I4QjWg2dBfGw0j68gG5butWFLXynLC5c9AQTfPs="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-/avxRvT35LxCBWkTYJDCtdd95VC67epZIPCMv994uBo="; + cargoHash = "sha256-G+vTW3hYNjZN3V5svltbKEeeUEolAVVbTOaAKVHEcUI="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. @@ -44,12 +44,12 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage $releaseDir/build/mdcat-*/out/mdcat.1 ln -sr $out/bin/{mdcat,mdless} - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for bin in mdcat mdless; do - installShellCompletion \ - --bash $releaseDir/build/mdcat-*/out/completions/$bin.bash \ - --fish $releaseDir/build/mdcat-*/out/completions/$bin.fish \ - --zsh $releaseDir/build/mdcat-*/out/completions/_$bin + installShellCompletion --cmd $bin \ + --bash <($out/bin/$bin --completions bash) \ + --fish <($out/bin/$bin --completions fish) \ + --zsh <($out/bin/$bin --completions zsh) done ''; diff --git a/pkgs/tools/text/mrkd/default.nix b/pkgs/tools/text/mrkd/default.nix index b43b6cfdf6abf..1c223861b4869 100644 --- a/pkgs/tools/text/mrkd/default.nix +++ b/pkgs/tools/text/mrkd/default.nix @@ -5,6 +5,7 @@ let python = python3.override { + self = python; packageOverrides = self: super: { # https://github.com/refi64/mrkd/pull/6 mistune = super.mistune.overridePythonAttrs (old: rec { diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index f37a8f1bd3420..658daf9ce2304 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Multitran: simple command line utilities for dictionary maintenance"; mainProgram = "mtquery"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/text/mw/default.nix b/pkgs/tools/text/mw/default.nix index c85b018280373..f1b8b9dcf3216 100644 --- a/pkgs/tools/text/mw/default.nix +++ b/pkgs/tools/text/mw/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildNpmPackage }: diff --git a/pkgs/tools/text/nerdfix/default.nix b/pkgs/tools/text/nerdfix/default.nix index fdad3094bbecd..f280c891643fd 100644 --- a/pkgs/tools/text/nerdfix/default.nix +++ b/pkgs/tools/text/nerdfix/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "nerdfix"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "loichyan"; repo = "nerdfix"; rev = "v${version}"; - hash = "sha256-V9f39/9k9kYjngYOSXJYblaKDABPCZbVWxD0p3ZWzlY="; + hash = "sha256-5pUFj3K4yH/M8F+ZpCHFO3gEfxQ4pwxRa6uJbejrQxQ="; }; - cargoHash = "sha256-PkUQZPLzvVJ7s1D9TkMmgIVQiR/E79BRCYmjZVcHIv8="; + cargoHash = "sha256-6S6NyX2hmkekgpuLaBjBxoybnqJpJXtqelJ+6YzxA0I="; meta = with lib; { description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project"; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 317d29003cd31..f12c0fdea5e80 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.nongnu.org/numdiff/"; license = licenses.gpl3Plus; - maintainers = with maintainers; []; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index bc4630b871787..5806a8ab4fafe 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opencc"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "BYVoid"; repo = "OpenCC"; rev = "ver.${version}"; - sha256 = "sha256-N7nazA0xoQ2ewOGDiJg1vBBYMdF1/qiCfNjG5CFFbuk="; + sha256 = "sha256-JKudwA2C7gHihjPnsqPq5i7X8TvG8yQYZEG5f/xu3yo="; }; nativeBuildInputs = diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index 76271f3d389bd..3d900ea7d996f 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -10,16 +11,16 @@ buildGoModule rec { pname = "ov"; - version = "0.34.1"; + version = "0.36.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-1IFjnBIa/xCX2nY0RHhj/7OCYErY9QB/OBMaf3wDvrc="; + hash = "sha256-0dnaZZmciKnN+rVKitqAf3Bt2vtWP+/fB1tuCuMRvio="; }; - vendorHash = "sha256-USMDIgB4LhI4kzSg2kkCXfbN9t49WEg0fUtAcZkngac="; + vendorHash = "sha256-Ktusm7NldO5dTiLBIZ7fzsQ69kyTmKs9OJXZPP1oSws="; ldflags = [ "-s" @@ -38,12 +39,12 @@ buildGoModule rec { outputs = [ "out" "doc" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ov \ - --bash <($out/bin/ov completion bash) \ - --fish <($out/bin/ov completion fish) \ - --zsh <($out/bin/ov completion zsh) - + --bash <($out/bin/ov --completion bash) \ + --fish <($out/bin/ov --completion fish) \ + --zsh <($out/bin/ov --completion zsh) + '' + '' mkdir -p $out/share/$name cp $src/ov-less.yaml $out/share/$name/less-config.yaml makeWrapper $out/bin/ov $out/bin/ov-less --add-flags "--config $out/share/$name/less-config.yaml" diff --git a/pkgs/tools/text/paperoni/default.nix b/pkgs/tools/text/paperoni/default.nix index 1ceb29f1265a6..5378598da7dff 100644 --- a/pkgs/tools/text/paperoni/default.nix +++ b/pkgs/tools/text/paperoni/default.nix @@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hipstermojo/paperoni"; changelog = "https://github.com/hipstermojo/paperoni/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/tools/text/pbgopy/default.nix index 0e1e766456a8a..50d0de133e8e3 100644 --- a/pkgs/tools/text/pbgopy/default.nix +++ b/pkgs/tools/text/pbgopy/default.nix @@ -18,6 +18,6 @@ buildGoModule rec { mainProgram = "pbgopy"; homepage = "https://github.com/nakabonne/pbgopy"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/percollate/default.nix b/pkgs/tools/text/percollate/default.nix index 09c749a1680b1..1b9923acc39c8 100644 --- a/pkgs/tools/text/percollate/default.nix +++ b/pkgs/tools/text/percollate/default.nix @@ -2,21 +2,21 @@ buildNpmPackage rec { pname = "percollate"; - version = "4.2.1"; + version = "4.2.3"; src = fetchFromGitHub { owner = "danburzo"; repo = pname; rev = "v${version}"; - hash = "sha256-vGBGw9dUOSvSqM4WN53bb2LRduLjR6fW99C0ScdMVXk="; + hash = "sha256-JpdSEockALXtuuMMi5mgD5AXcayojyK0qMMWF+XFfZE="; }; - npmDepsHash = "sha256-Qne4XjUmJS5e6x380CFY3Kd7/5coXHMxniMfqYIHQcQ="; + npmDepsHash = "sha256-qWu1YYi4ddpAUtbDxF4YA8OO6BLZ6gfeb4pw0n9BaZw="; dontNpmBuild = true; # Dev dependencies include an unnecessary Java dependency (epubchecker) - # https://github.com/danburzo/percollate/blob/v4.2.1/package.json#L40 + # https://github.com/danburzo/percollate/blob/v4.2.3/package.json#L40 npmInstallFlags = [ "--omit=dev" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix index 9d434d1aa98f0..b2427e4f5f4b1 100644 --- a/pkgs/tools/text/pinyin-tool/default.nix +++ b/pkgs/tools/text/pinyin-tool/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b"; }; - cargoSha256 = "1ixl4bsb8c8dmz9s28a2v5l5f2hi3g9xjy6ribmhybpwmfs4mr4d"; + cargoHash = "sha256-jeRKtKv8Lg/ritl42dMbEQpXaNlCIaHTrw0xtPQitMc="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index b59aba6c4615e..1a2fb97391394 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { mainProgram = "podiff"; homepage = "http://puszcza.gnu.org.ua/software/podiff"; license = licenses.gpl3Plus; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 58185538193f3..6133bc409ddca 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "3.4.2"; + version = "3.4.4"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - hash = "sha256-CfCWfKRzeGGk8/B0BLauO4Xb88/Si1ezvcGKeURgC9o="; + hash = "sha256-SZjsJQYJCXQendzQ2Tobg+IgkWL6lFX5YnMfruPt7UA="; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook3 diff --git a/pkgs/tools/text/reveal-md/default.nix b/pkgs/tools/text/reveal-md/default.nix index 9da86f2a61c85..5f6bf17eb4598 100644 --- a/pkgs/tools/text/reveal-md/default.nix +++ b/pkgs/tools/text/reveal-md/default.nix @@ -5,19 +5,19 @@ buildNpmPackage rec { pname = "reveal-md"; - version = "5.5.2"; + version = "6.1.2"; src = fetchFromGitHub { owner = "webpro"; repo = "reveal-md"; rev = version; - hash = "sha256-Uge7N6z9O1wc+nW/0k5qz+CPYbYgr7u2mulH75pXvHY="; + hash = "sha256-MPNxQpof36XHg3Zl7fHkyCXnoDOcRvMiMiPH29GEWqE="; }; - npmDepsHash = "sha256-+gzur0pAmZe4nrDxNQwjFn/hM9TvZEd6JzLOnJLhNtg="; + npmDepsHash = "sha256-535tauun6ysPDC096ttPpvJZ+RSZ75aY8mVKj8mnMJI="; env = { - PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true; + PUPPETEER_SKIP_DOWNLOAD = true; }; dontNpmBuild = true; diff --git a/pkgs/tools/text/rnr/default.nix b/pkgs/tools/text/rnr/default.nix index fbc4f1b382f8e..31f627d4bae6b 100644 --- a/pkgs/tools/text/rnr/default.nix +++ b/pkgs/tools/text/rnr/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-g/PnvOZzlWzEHf3vvYANeJ2ogQ/6duNzhlKpKMBoBFU="; }; - cargoSha256 = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw="; + cargoHash = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw="; meta = with lib; { description = "Command-line tool to batch rename files and directories"; diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/tools/text/runiq/default.nix index 330c4cdbf930c..0226677981094 100644 --- a/pkgs/tools/text/runiq/default.nix +++ b/pkgs/tools/text/runiq/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-qcgPuJOpK2fCsHAgzoIKF7upb9B3ySIZkpu9xf4JnCc="; + hash = "sha256-qcgPuJOpK2fCsHAgzoIKF7upb9B3ySIZkpu9xf4JnCc="; }; cargoHash = "sha256-WSMV0GNKNckN9uSPN647iDloGkNtaKcrZbeyglUappc="; diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index bb1d7dfc99047..4453f7317db6e 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.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "TankerHQ"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rndWKi/EDQzTWAw2deddhTXdmIfuEVM54MOfS4mNf+Y="; + sha256 = "sha256-N71oiOlhMMDq0VhujV4SgnnKMQRi5SdplrTjK2vyhUE="; }; - cargoHash = "sha256-DkhmMdpUcka6Wkyz6hEfqB2gUpsGNziGv+23rVfwXN8="; + cargoHash = "sha256-EyLompGEin12q6SC1M1D0QsE42HVEq5O/E99qi54cGo="; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/tools/text/rust-petname/default.nix index 3abc8a0210f65..8879dd282cfaf 100644 --- a/pkgs/tools/text/rust-petname/default.nix +++ b/pkgs/tools/text/rust-petname/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "petname"; - sha256 = "sha256-KP+GdGlwLHcKE8nAmFr2wHbt5RD9Ptpiz1X5HgJ6BgU="; + hash = "sha256-KP+GdGlwLHcKE8nAmFr2wHbt5RD9Ptpiz1X5HgJ6BgU="; }; cargoHash = "sha256-R1Xahr9R4G8Tr2cGRJ2oydVaLohPz2VM6tnbtE8Hysk="; diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index a3fba1a8d088a..eecfbe0d83abd 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.29"; + version = "0.4.31"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "sad"; rev = "refs/tags/v${version}"; - hash = "sha256-TLVUvz/phAy+ljIsdv4GVSFHTAZ5ywQs32WHsu9g9Fc="; + hash = "sha256-frsOfv98VdetlwgNA6O0KEhcCSY9tQeEwkl2am226ko="; }; - cargoHash = "sha256-4XmTxeKbdC4HRownFlEc4GrSVimKkQg/yNI0us7gzQI="; + cargoHash = "sha256-2oZf2wim2h/krGZMg7Psxx0VLFE/Xf1d1vWqkVtjSmo="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index 0c4afcad4f87a..7b17d94a05af8 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.19.0"; + version = "0.20.0"; src = fetchCrate { inherit pname version; - hash = "sha256-HfZ8zyjghTXIyIYS+MaGF5OdMLJv6NIjQswdn/tvQbU="; + hash = "sha256-ouyhdT6XTuWYBxi8HV0dWt/0dHml8YXjf2kzd90Eax0="; }; - cargoHash = "sha256-py8VVciNJ36/aSTlTH+Bx36yrh/8AuzB9XNNv/PrFak="; + cargoHash = "sha256-2R8dy9WnEPffkoJfQD8uFL0Ot3D2yibPxIjqRJ+6rMI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/seehecht/default.nix b/pkgs/tools/text/seehecht/default.nix index 9a7b1f936a99d..0b1fb3bcef72d 100644 --- a/pkgs/tools/text/seehecht/default.nix +++ b/pkgs/tools/text/seehecht/default.nix @@ -9,10 +9,10 @@ rustPlatform.buildRustPackage rec { owner = "annaaurora"; repo = "seehecht"; rev = "v${version}"; - sha256 = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0="; + hash = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0="; }; - cargoSha256 = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA="; + cargoHash = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA="; postInstall = '' ln -s $out/bin/seh $out/bin/seehecht diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index a744300bfddec..f455d0f97c658 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { license = "custom"; homepage = "http://www.jclark.com/jade/"; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/pkgs/tools/text/sgml/linuxdoc-tools/default.nix index d2611bec73187..58d3ace63caf2 100644 --- a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix +++ b/pkgs/tools/text/sgml/linuxdoc-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "agmartin"; repo = "linuxdoc-tools"; rev = version; - sha256 = "sha256-1F3MDYJ9UH7ypgTSfYZV59PfLirlTmw6XBMEnz5Jtyk="; + hash = "sha256-1F3MDYJ9UH7ypgTSfYZV59PfLirlTmw6XBMEnz5Jtyk="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index a51bd79251646..a3915a2d664ff 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://openjade.sourceforge.net/"; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix deleted file mode 100644 index bbc60921903d6..0000000000000 --- a/pkgs/tools/text/shab/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ bash, stdenv, lib, runCommand, writeText, fetchFromGitHub }: -let - version = "1.0.0"; - - shab = stdenv.mkDerivation { - pname = "shab"; - inherit version; - - src = fetchFromGitHub { - owner = "zimbatm"; - repo = "shab"; - rev = "v${version}"; - sha256 = "02lf1s6plhhcfyj9xha44wij9jbphb1x5q55xj3b5bx2ji2jsvji"; - }; - - postPatch = '' - for f in test.sh test/*.sh; do - patchShebangs "$f" - done - ''; - - doCheck = true; - doInstallCheck = true; - - checkPhase = '' - ./test.sh - ''; - - installPhase = '' - mkdir -p $out/bin - cp ./shab $out/bin/shab - ''; - - installCheckPhase = '' - [[ "$(echo 'Hello $entity' | entity=world $out/bin/shab)" == 'Hello world' ]] - ''; - - passthru = { - inherit render renderText; - }; - - meta = with lib; { - description = "Bash templating language"; - mainProgram = "shab"; - homepage = "https://github.com/zimbatm/shab"; - license = licenses.unlicense; - maintainers = with maintainers; [ zimbatm ]; - platforms = bash.meta.platforms; - }; - }; - - /* - shabScript: a path or filename to use as a template - parameters.name: the name to use as part of the store path - parameters: variables to expose to the template - */ - render = shabScript: parameters: - let extraParams = { - inherit shabScript; - }; - in runCommand "out" (parameters // extraParams) '' - ${shab}/bin/shab "$shabScript" >$out - ''; - - /* - shabScriptText: a string to use as a template - parameters.name: the name to use as part of the store path - parameters: variables to expose to the template - */ - renderText = shabScriptText: parameters: - render (writeText "template" shabScriptText) parameters; - -in - shab diff --git a/pkgs/tools/text/termbook/default.nix b/pkgs/tools/text/termbook/default.nix index d16dc05cba53b..437016e25ec23 100644 --- a/pkgs/tools/text/termbook/default.nix +++ b/pkgs/tools/text/termbook/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ln -sf ${./Cargo.lock} Cargo.lock ''; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd termbook \ --bash <($out/bin/termbook completions bash) \ --fish <($out/bin/termbook completions fish) \ diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/tools/text/tidy-viewer/default.nix index b2d55ee276150..a88960739ae54 100644 --- a/pkgs/tools/text/tidy-viewer/default.nix +++ b/pkgs/tools/text/tidy-viewer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4="; }; - cargoSha256 = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM="; + cargoHash = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM="; # this test parses command line arguments # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context diff --git a/pkgs/tools/text/topfew/default.nix b/pkgs/tools/text/topfew/default.nix index 967e4e1403a26..b908d41b6447d 100644 --- a/pkgs/tools/text/topfew/default.nix +++ b/pkgs/tools/text/topfew/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "topfew"; - version = "0.9.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "timbray"; repo = "topfew"; - rev = version; - hash = "sha256-6ydi/4LyqTLKpR00f4zpcrTnCorlhnsBOxdhzBMNcRI="; + rev = "v${version}"; + hash = "sha256-P3K3IhgYkrxmEG2l7EQDVWQ+P7fOjUMUFrlAnY+8NmI="; }; vendorHash = null; diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/tools/text/tv/default.nix index 9cf6e2e243e80..154d98b4c592c 100644 --- a/pkgs/tools/text/tv/default.nix +++ b/pkgs/tools/text/tv/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM="; }; - cargoSha256 = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI="; + cargoHash = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI="; meta = with lib; { description = "Format json into table view"; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 9cffa4ce6909a..219b2806c8499 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "6.0.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-jZWmWZ4ZkmtdEI7BJ4cg1PBAuue8sjA7aiGotv2WmB4="; + hash = "sha256-0T/fX+ZzxfJD3CmoYLWSe3LE6B4HWkCC2bqXNwzUVpk="; }; buildInputs = [ diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index d83e9393f9412..a853a5de7775f 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -2,13 +2,20 @@ stdenv.mkDerivation rec { pname = "uni2ascii"; - version = "4.18"; + version = "4.20"; src = fetchurl { url = "https://billposer.org/Software/Downloads/uni2ascii-${version}.tar.gz"; - sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; + hash = "sha256-7tjYOpwdLb0NfKTFJRmYg9cxfWiLQhtXjQmKJ7b/cFY="; }; + patches = [ + (fetchurl { + url = "https://github.com/Homebrew/formula-patches/raw/bb92449ad6b3878b4d6f472237152df28080df86/uni2ascii/uni2ascii-4.20.patch"; + hash = "sha256-JQpSntoTbQ7fnmO5Km/pX071360/lOb9jYdxOK2oV/g="; + }) + ]; + meta = { license = lib.licenses.gpl3; homepage = "http://billposer.org/Software/uni2ascii.html"; @@ -35,7 +42,7 @@ stdenv.mkDerivation rec { It also provides ways of converting non-ASCII characters to similar ASCII characters, e.g. by stripping diacritics. ''; - maintainers = with lib.maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index 66f8fd2a6509b..81e97d1a13fde 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -1,11 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, python3, libreoffice-unwrapped, asciidoc, makeWrapper +{ lib, stdenv, fetchFromGitHub, libreoffice-unwrapped, asciidoc, makeWrapper # whether to install odt2pdf/odt2doc/... symlinks to unoconv , installSymlinks ? true }: -# IMPORTANT: unoconv must use the same python version as libreoffice (unless it -# will not be able to load the pyuno module from libreoffice). - stdenv.mkDerivation rec { pname = "unoconv"; version = "0.9.0"; @@ -24,7 +21,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - sed -i "s|/usr/bin/env python.*|${python3}/bin/${python3.executable}|" "$out/bin/unoconv" + sed -i "s|/usr/bin/env python.*|${libreoffice-unwrapped.python.interpreter}|" "$out/bin/unoconv" wrapProgram "$out/bin/unoconv" \ --set-default UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/" '' + lib.optionalString installSymlinks '' @@ -37,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "unoconv"; }; } diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 2dfb2f00f662e..928d2a4498caf 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "vale"; - version = "3.6.0"; + version = "3.7.0"; subPackages = [ "cmd/vale" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-Xkea1o0ywRKIg0cMJuxQehHbgVF0SSC9VRa53FQEong="; + hash = "sha256-rngqTCnNQCecf/W2GkpJfKtfxfPq9Dd7yQlHzb2waKs="; }; vendorHash = "sha256-OLlViQKLTark9yknnjJFiEThFtxNNjue5LUp1P/anKU="; diff --git a/pkgs/tools/text/write-good/default.nix b/pkgs/tools/text/write-good/default.nix index db3e16c23debd..99105ce649d5d 100644 --- a/pkgs/tools/text/write-good/default.nix +++ b/pkgs/tools/text/write-good/default.nix @@ -23,6 +23,6 @@ buildNpmPackage rec { homepage = "https://github.com/btford/write-good"; license = lib.licenses.mit; mainProgram = "write-good"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 5e9df9f513b6c..91c6c9520ce6d 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "10.7"; + version = "11.0"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-Jr73UoyJfhtXLnYgOPh+jqKc3XZs+WMwJaO5nuD+Vmw="; + hash = "sha256-ePXoinOnm9BgMeCGTtWE3ahDsEtzReAiDLMwm9cB3tE="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 1de721fb0b0e2..0acc471b70174 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "relaxng"; repo = "jing-trang"; rev = "V${version}"; - sha256 = "sha256-Krupa3MGk5UaaQsaNpPMZuIUzHJytDiksz9ysCPkFS4="; + hash = "sha256-Krupa3MGk5UaaQsaNpPMZuIUzHJytDiksz9ysCPkFS4="; fetchSubmodules = true; }; diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index bf5a7ed6b8054..b779a6c962ca4 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045"; }; - cargoSha256 = "1bh60zgflaa5n914irkr4bpq3m4h2ngcj6bp5xx1qj112dwgvmyb"; + cargoHash = "sha256-y9f9eBMhSBx6L3cZyZ4VkNSB7yJ55khCskUp6t4HBq4="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch b/pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch new file mode 100644 index 0000000000000..e18d52af0be68 --- /dev/null +++ b/pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch @@ -0,0 +1,26 @@ +From b90b2c5989e9ddd3cfc79f56cb8a9194561bd4d7 Mon Sep 17 00:00:00 2001 +From: Tom Wieczorek <tom@bibbu.net> +Date: Fri, 26 Jul 2024 11:08:45 +0200 +Subject: [PATCH] Don't strip binary when installing + +Doesn't play well with cross-compiling. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 724c962..284cab3 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,7 +12,7 @@ test: yx + (cd tests && ./do_tests.sh) + + install: yx +- install -sDm0755 -t "$(PREFIX)"/bin yx ++ install -Dm0755 -t "$(PREFIX)"/bin yx + install -Dm0644 -t "$(PREFIX)"/share/man/man1 yx.1 + + clean: +-- +2.42.2 + diff --git a/pkgs/tools/text/yx/default.nix b/pkgs/tools/text/yx/default.nix index 732be1760c9e3..f773ca66a0000 100644 --- a/pkgs/tools/text/yx/default.nix +++ b/pkgs/tools/text/yx/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , libyaml , testers , yx @@ -16,6 +17,16 @@ stdenv.mkDerivation rec { hash = "sha256-uuso+hsmdsB7VpIRKob8rfMaWvRMCBHvCFnYrHPC6iw="; }; + patches = [ + # https://gitlab.com/tomalok/yx/-/issues/2 + ./0001-Don-t-strip-binary-when-installing.patch + (fetchpatch { + # https://gitlab.com/tomalok/yx/-/merge_requests/10 + url = "https://gitlab.com/tomalok/yx/-/commit/5747ca40f4b0acb56d67fd29a818734d7b19d61a.patch"; + hash = "sha256-0tNtkq1tZ96Ag5EJfUfDao/QxpRB4Jadop3OPBvhnlo="; + }) + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; |