From d1dd7e6eb005cae72cb1248044e50d5d27c8a9cf Mon Sep 17 00:00:00 2001 From: nicknb Date: Tue, 23 Jun 2026 02:08:42 +0200 Subject: [PATCH] circumflex: install man page, shell completions; cleanup Install the man page and shell completions. Additional cleanup: Remove less and ncurses from PATH. Upstream switched to a native comments viewer which does not depend on either. See commits [0] 56d20830bb and [1] 59d0206652 respectively. Skip building the 'gen-completions' package used for generating shell completions. These are part of the source tree under share/ and can be installed from there. This was, funnily enough, polluting the user environment with a binary of the same name. [0]: https://github.com/bensadeh/circumflex/commit/56d20830bb [1]: https://github.com/bensadeh/circumflex/commit/59d0206652 --- pkgs/by-name/ci/circumflex/package.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ci/circumflex/package.nix b/pkgs/by-name/ci/circumflex/package.nix index 13b89884cd2e..c67ad6087ee0 100644 --- a/pkgs/by-name/ci/circumflex/package.nix +++ b/pkgs/by-name/ci/circumflex/package.nix @@ -1,10 +1,8 @@ { lib, - less, - ncurses, buildGoModule, fetchFromGitHub, - makeWrapper, + installShellFiles, }: buildGoModule (finalAttrs: { @@ -20,16 +18,20 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-4YL0N8wA8igveYfeL4uZDY5YD1InW0iD3WWq1E/vIJs="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + ]; + + excludedPackages = [ + "gen-completions" + ]; postInstall = '' - wrapProgram $out/bin/clx \ - --prefix PATH : ${ - lib.makeBinPath [ - less - ncurses - ] - } + installManPage share/man/clx.1 + + installShellCompletion --bash share/completions/clx.bash + installShellCompletion --fish share/completions/clx.fish + installShellCompletion --zsh share/completions/_clx ''; meta = {