From 9452a29d2347a6700d33fae8fe952178c90c6aed Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 23 Nov 2025 20:48:27 +0900 Subject: [PATCH 1/4] chawan: 0.2.2 -> 0.3.0 Changelog: https://git.sr.ht/~bptato/chawan/tree/v0.3.0/item/NEWS#L1-92 --- pkgs/by-name/ch/chawan/mancha-augment-path.diff | 8 ++++---- pkgs/by-name/ch/chawan/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ch/chawan/mancha-augment-path.diff b/pkgs/by-name/ch/chawan/mancha-augment-path.diff index 5a1be54fdfa3..55c1534ef492 100644 --- a/pkgs/by-name/ch/chawan/mancha-augment-path.diff +++ b/pkgs/by-name/ch/chawan/mancha-augment-path.diff @@ -2,12 +2,12 @@ Add the -m option to man's command line to augment the list of paths searched by The required -m option is only available in the mandoc implementation. --- a/adapter/protocol/man.nim +++ b/adapter/protocol/man.nim -@@ -264,7 +264,7 @@ proc myOpen(cmd: string): tuple[ofile, efile: File] = - +@@ -290,7 +290,7 @@ proc myOpen(cmd: string): Opt[tuple[ofile, efile: AChaFile]] = proc doMan(man, keyword, section: string) = let sectionOpt = if section == "": "" else: ' ' & quoteShellPosix(section) let cmd = "MANCOLOR=1 GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 " & - man & sectionOpt & ' ' & quoteShellPosix(keyword) + man & sectionOpt & " -m @out@ " & quoteShellPosix(keyword) - let (ofile, efile) = myOpen(cmd) - if ofile == nil: + let (ofile, efile) = myOpen(cmd).orDie(ceInternalError, "failed to run man") + var manword = keyword + if section != "": diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index a1ea2d0cbc56..3485ec03a0c3 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "chawan"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~bptato"; repo = "chawan"; - rev = "v${finalAttrs.version}"; - hash = "sha256-pUwwqFvTtLAGFQG62W90hEH+yPN+ifa5BDRYNh/Jupg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-y1z1MlwbKGpvtgt4OZtfvxvsOSE6RhnsWUeaRvu7etU="; }; patches = [ ./mancha-augment-path.diff ]; From 803f48bb46df27c2930039c1dea55e05c4e75187 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 24 Nov 2025 03:39:33 +0900 Subject: [PATCH 2/4] chawan: remove mancha patch Co-authored-by: bptato --- pkgs/by-name/ch/chawan/mancha-augment-path.diff | 13 ------------- pkgs/by-name/ch/chawan/package.nix | 9 --------- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/by-name/ch/chawan/mancha-augment-path.diff diff --git a/pkgs/by-name/ch/chawan/mancha-augment-path.diff b/pkgs/by-name/ch/chawan/mancha-augment-path.diff deleted file mode 100644 index 55c1534ef492..000000000000 --- a/pkgs/by-name/ch/chawan/mancha-augment-path.diff +++ /dev/null @@ -1,13 +0,0 @@ -Add the -m option to man's command line to augment the list of paths searched by man. -The required -m option is only available in the mandoc implementation. ---- a/adapter/protocol/man.nim -+++ b/adapter/protocol/man.nim -@@ -290,7 +290,7 @@ proc myOpen(cmd: string): Opt[tuple[ofile, efile: AChaFile]] = - proc doMan(man, keyword, section: string) = - let sectionOpt = if section == "": "" else: ' ' & quoteShellPosix(section) - let cmd = "MANCOLOR=1 GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 " & -- man & sectionOpt & ' ' & quoteShellPosix(keyword) -+ man & sectionOpt & " -m @out@ " & quoteShellPosix(keyword) - let (ofile, efile) = myOpen(cmd).orDie(ceInternalError, "failed to run man") - var manword = keyword - if section != "": diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index 3485ec03a0c3..a4348ecf616e 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -26,15 +26,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-y1z1MlwbKGpvtgt4OZtfvxvsOSE6RhnsWUeaRvu7etU="; }; - patches = [ ./mancha-augment-path.diff ]; - - # Include chawan's man pages in mancha's search path - postPatch = '' - # As we need the $out reference, we can't use `replaceVars` here. - substituteInPlace adapter/protocol/man.nim \ - --replace-fail '@out@' "$out" - ''; - env.NIX_CFLAGS_COMPILE = toString ( lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration" ); From ee023be82f909518f42311b86720628fdc80a2c7 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 24 Nov 2025 03:42:39 +0900 Subject: [PATCH 3/4] chawan: remove unused buildInputs Co-authored-by: bptato --- pkgs/by-name/ch/chawan/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index a4348ecf616e..6c7a8a201f76 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -3,14 +3,12 @@ stdenv, fetchFromSourcehut, makeBinaryWrapper, - curlMinimal, + openssl, + libssh2, mandoc, - ncurses, nim, - pandoc, pkg-config, brotli, - zlib, gitUpdater, versionCheckHook, }: @@ -33,20 +31,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper nim - pandoc pkg-config brotli ]; buildInputs = [ - curlMinimal - ncurses - zlib + openssl + libssh2 ]; buildFlags = [ "all" - "manpage" ]; installFlags = [ "DESTDIR=$(out)" From cffa3bc6b45cd8c613ee91e9ace8497e0f3f0a5d Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 27 Nov 2025 02:10:52 +0900 Subject: [PATCH 4/4] chawan: avoid enforcing mandoc Co-authored-by: bptato --- pkgs/by-name/ch/chawan/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index 6c7a8a201f76..2d6b9feafd4f 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -5,7 +5,6 @@ makeBinaryWrapper, openssl, libssh2, - mandoc, nim, pkg-config, brotli, @@ -51,12 +50,10 @@ stdenv.mkDerivation (finalAttrs: { postInstall = let makeWrapperArgs = '' - --set MANCHA_CHA $out/bin/cha \ - --set MANCHA_MAN ${mandoc}/bin/man + --set MANCHA_CHA $out/bin/cha ''; in '' - wrapProgram $out/bin/cha ${makeWrapperArgs} wrapProgram $out/bin/mancha ${makeWrapperArgs} '';