From 32da9861d5e8d8c3a51e3a102f08f15072ab8eea Mon Sep 17 00:00:00 2001 From: sterni Date: Thu, 3 Feb 2022 19:39:18 +0100 Subject: refactor: expose cheddar-about script from cheddar Any other cgit configuration in depot would need this script wrapper as well. Change-Id: Ifa04e1c9de9c925eb3f60c5d3854221ae02ef06c Reviewed-on: https://cl.tvl.fyi/c/depot/+/5206 Tested-by: BuildkiteCI Reviewed-by: tazjin Autosubmit: sterni --- tools/cheddar/default.nix | 11 +++++++++++ web/cgit-taz/default.nix | 5 +---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/cheddar/default.nix b/tools/cheddar/default.nix index c8d7ba5ffef2..8d37694c008d 100644 --- a/tools/cheddar/default.nix +++ b/tools/cheddar/default.nix @@ -9,4 +9,15 @@ depot.third_party.naersk.buildPackage { # plus additional languages we care about. BAT_SYNTAXES = "${depot.third_party.bat_syntaxes}"; }; + + passthru = { + # Wrapper for cgit which can't be told to pass arguments to a filter + about-filter = pkgs.writeShellScriptBin "cheddar-about" '' + exec ${depot.tools.cheddar}/bin/cheddar --about-filter $@ + ''; + }; + + meta.targets = [ + "about-filter" + ]; } diff --git a/web/cgit-taz/default.nix b/web/cgit-taz/default.nix index 83ec822e5d6b..d20bbbe3135b 100644 --- a/web/cgit-taz/default.nix +++ b/web/cgit-taz/default.nix @@ -10,15 +10,12 @@ let writeText ; - sourceFilter = writeShellScriptBin "cheddar-about" '' - exec ${depot.tools.cheddar}/bin/cheddar --about-filter $@ - ''; cgitConfig = writeText "cgitrc" '' # Global configuration virtual-root=/ enable-http-clone=0 readme=:README.md - about-filter=${sourceFilter}/bin/cheddar-about + about-filter=${depot.tools.cheddar.about-filter}/bin/cheddar-about source-filter=${depot.tools.cheddar}/bin/cheddar enable-log-filecount=1 enable-log-linecount=1 -- cgit 1.4.1