about summary refs log tree commit diff
path: root/third_party/cgit
AgeCommit message (Collapse)AuthorFilesLines
2023-09-19 r/6620 chore(3p/sources): bump channels and overlays (2023-09-17)Vincent Ambo2-2/+2
* 3p/cgit: import fixes for git v2.42.0 Upstream patch: https://git.zx2c4.com/cgit/patch/?id=2f50b47c72cbc4270bbd12ae7f520486d5f42736 Change-Id: I7549f909b145becaccb983936dc5c3e17941122b Reviewed-on: https://cl.tvl.fyi/c/depot/+/9353 Reviewed-by: Connor Brewster <cbrewster@hey.com> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
2023-06-29 r/6361 chore(3p/sources): Bump channels & overlayssterni18-65/+78
* //3p/sources: switch stable channel from 21.11 (!) to 23.05 * //users: adapt to emacsUnstable to emacs-unstable rename * //users/grfn: use default Linux kernel version everywhere, as 5.15 has broken in this version of nixos-unstable. * //3p/cgit: adapt to git 2.41.0 The committed changes are the same as the [patch1] I've submitted to cgit-pink which is in turn based on Christian Hesse's [patch2]. patch1: https://causal.agency/list/thread/20230624144033.802270-1-sternenseemann%40systemli.org.html#20230624144033.802270-2-sternenseemann@systemli.org> patch2: https://lists.zx2c4.com/pipermail/cgit/2023-June/004843.html Co-authored-by: Christian Hesse <mail@eworm.de> Change-Id: I549a62e7c85c66d772edda997819a40f2d5835d7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8855 Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de> Reviewed-by: grfn <grfn@gws.fyi>
2022-06-22 r/4252 style(3p/cgit): move commit decorations left of subjectVincent Ambo1-1/+2
the commit decoration layout is designed for situations where very few commits have decorations, but every depot commit has a revision. putting these on the left of the commit subject looks a lot more reasonable. ideally we would actually put them in the table as a column, but that'd be a much larger change. Change-Id: I0b44dbef36b64b183d66278d7ab7e4ff17554684 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5892 Tested-by: BuildkiteCI Reviewed-by: Profpatsch <mail@profpatsch.de>
2022-06-22 r/4251 feat(3p/cgit): Display depot revisions in log viewsVincent Ambo2-0/+18
depot revisions are not recognised by git as a specific type of "decoration" (i.e. fall into `DECORATION_NONE`), which means that cgit skips them by default. Displaying them on code.tvl.fyi would be quite nice, so to work around this we check for the `refs/r/` prefix on skipped decorations and display them (without the `refs/` prefix) on commits. Change-Id: Ia9cece3876db471f93ab787258be527739af046b Reviewed-on: https://cl.tvl.fyi/c/depot/+/5891 Tested-by: BuildkiteCI Reviewed-by: Profpatsch <mail@profpatsch.de>
2022-05-19 r/4097 chore(3p/cgit): strip debug symbols on the cgit cgi scriptsterni1-0/+2
This saves 10MB which seems useful for a CGI binary that is started a lot. Change-Id: I9536955d3962647a3fce2821bbdc4c3826fb4a91 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5639 Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
2022-05-19 r/4096 chore(3p/cgit): don't unnecessarily install cgit filterssterni1-0/+6
We don't use these filters, utilizing cheddar instead. They don't work as it stands anyway, since they require wrapping to find their (mostly Python) dependencies. Change-Id: I19a690dca4fbfc03784850597752ab617f0c0522 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5638 Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
2022-05-19 r/4095 fix(3p/cgit): substitute newly supported compression toolssterni1-1/+3
This code is copied from the cgit derivation in nixpkgs, seems like we missed when these new compression methods were added. Change-Id: I2d4118785abc173c86ac92e3007cd7027a1e0496 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5637 Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
2022-05-19 r/4094 subtree(3p/cgit): merge cgit-pink into depot cgitsterni39-1615/+184
cgit-pink is a maintained fork of cgit that follows upstream git more closely and already contains a lot of patches we already had applied. Consequently, it seems sensible it becomes our future upstream, we may even be able to upstream some of our custom, less invasive patches. Change-Id: Ia081e4508866f32298986c7160f4890c8a7c8922
2022-05-18 r/4093 fix(3p/cgit): Fix bad free in cgit_diff_treeJune McEnroe1-7/+5
Since git commit 244c27242f44e6b88e3a381c90bde08d134c274b, > diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec) calling diff_flush calls free(3) on opts.pathspec.items, so it can't be a pointer to a stack variable. (cherry-picked from commit https://git.causal.agency/cgit-pink/commit/?id=cc167887f1ee6907103533187ff9679f01006a1f) Change-Id: I3054b0839f46465e8a5ce0da52a87357c7d77128 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5631 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-05-04 r/4004 subtree(3p/cgit): update for git 2.36.0 supportsterni3-3/+2
Merge commit '51596ba1c25ff0dbba894153015203b4f1d3947b' into canon Change-Id: Iaaf7a849d111aebc6bf85cec118439ba1d49f1e3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5521 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-05-04 r/4003 chore(3p/sources): Bump channels & overlayssterni1-0/+1
* //nix/buildLisp: ccl dumped images have fixed themselves… again * //3p/git: rebase patch on 2.36.0 * //3p/overlays/haskell: remove upstreamed workarounds * Disable everything depending on cgit temporarily, since it doesn't compile with git 2.36 yet. Change-Id: I9dc11c0846641341adbdcc7162cbf149a15fe0cb Reviewed-on: https://cl.tvl.fyi/c/depot/+/5519 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-01-31 r/3723 style: format entire depot with nixpkgs-fmtVincent Ambo1-1/+2
This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
2021-12-07 r/3147 chore(3p): bump NixOS channels and emacs overlay to 2021-12-07sterni2-2/+2
* //third_party/cgit: apply patch [1] for Git 2.34 compatibility to reflect dropping of the string_list_init function in 770fed [2]. Patch hasn't been applied on cgit's master yet, over concern about a breaking change in git (?) [3]. [1]: https://lists.zx2c4.com/pipermail/cgit/2021-November/004666.html [2]: https://github.com/git/git/commit/770fedaf9fb156bd8c18da41770eac0cb63fba63 [3]: https://lists.zx2c4.com/pipermail/cgit/2021-November/004667.html Change-Id: Ie10c99c017ae5a43f4369b42151e19ecf07f7949
2021-09-27 r/2926 feat(web/cgit): Use new logo in cgit pageVincent Ambo1-0/+5
Change-Id: I5212b235aa2a72c90e4795dce4c9fccfa00ddec3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3629 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
2021-09-21 r/2903 chore(3p/git): Unvendor git and track patches insteadVincent Ambo1-4/+7
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
2021-09-21 r/2902 chore(3p/cgit): git: update to v2.32.0Christian Hesse5-36/+23
Update to git version v2.32.0, this requires changes for these upstream commits: * 47957485b3b731a7860e0554d2bd12c0dce1c75a tree.h API: simplify read_tree_recursive() signature Signed-off-by: Christian Hesse <mail@eworm.de> Change-Id: I9c37205af2e67d03f9cdd3d39e4fbd611bfa7288
2021-09-21 r/2901 chore(3p/cgit): git: update to v2.31.1Christian Hesse1-1/+1
Update to git version v2.31.1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de> Change-Id: I3e0312e59b065ec39906d00ffa8e762f82b7305f
2021-09-21 r/2900 fix(3p/cgit): md2html: use proper formatting for hrChristian Hesse1-5/+1
This addressed a non-existent background image and made the element invisible. Drop the style and use something sane. Signed-off-by: Christian Hesse <mail@eworm.de> Change-Id: I4f94466742008b9cdb231358199074de6e4424ee
2021-09-21 r/2899 chore(3p/cgit): git: update to v2.31.0Christian Hesse2-4/+5
Update to git version v2.31.0, this requires changes for these upstream commits: * 36a317929b8f0c67d77d54235f2d20751c576cbb refs: switch peel_ref() to peel_iterated_oid() Signed-off-by: Christian Hesse <mail@eworm.de> Change-Id: Idb3abf22eb68ba5219f22075811884bbce786c3b
2021-09-21 r/2898 chore(3p/cgit): git: update to v2.30.1Christian Hesse1-1/+1
Update to git version v2.30.1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de> Change-Id: I9c8a572fcef2dbb3164ecc397dc071240eba8480
2021-09-21 r/2897 test(3p/cgit): t0107: support older and/or non-GNU tarTodd Zullinger1-4/+4
The untar tests for various compression algorithms use shortcut options from GNU tar to handle decompression. These options may not be provided by non-GNU tar nor even by slightly older GNU tar versions which ship on many systems. An example of the latter case is the --zstd option. This was added in GNU tar-1.32 (2019-02-23)¹. This version of tar is not provided by CentOS/RHEL, in particular. In Debian, --zstd has been backported to the tar-1.30 release. Avoid the requirement on any specific implementations or versions of tar by piping decompressed output to tar. This is compatible with older GNU tar releases as well as tar implementations from other vendors. (It may also be a slight benefit that this more closely matches what the snapshot creation code does.) ¹ Technically, the --zstd option was first released in tar-1.31 (2019-01-02), but this release was very short-lived and is no longer listed on the GNU Tar release page. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Change-Id: Ib65412cd1d23312ddd4cf840c09efc32512d3122
2021-09-21 r/2896 refactor(3p/cgit): md2html: use sane_lists extensionJason A. Donenfeld1-0/+1
This allows for cleaner nesting semantics and matches github more closely. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Change-Id: I93dacc0c276fefb28d67379ef38b8647c584244b
2021-09-21 r/2895 chore(3p/cgit): git: update to v2.30.0Christian Hesse5-33/+35
Update to git version v2.30.0, this requires changes for these upstream commits: * 88894aaeeae92e8cb41143cc2e045f50289dc790 blame: simplify 'setup_scoreboard' interface * 1fbfdf556f2abc708183caca53ae4e2881b46ae2 banned.h: mark non-reentrant gmtime, etc as banned Signed-off-by: Christian Hesse <mail@eworm.de> Change-Id: I6076ef250102010b601c92e9ea5bab2061b77006
2021-09-21 r/2894 chore(3p/cgit): git: update to v2.29.2Christian Hesse1-1/+1
Update to git version v2.29.2. No changes required. Signed-off-by: Christian Hesse <mail@eworm.de> Change-Id: I8a3c12fdaa492ede79a750eea4b78f750dbfa18f
2021-09-21 r/2893 chore(3p/cgit): git: update to v2.29.1Christian Hesse2-2/+1
Update to git version v2.29.1. No functional change, but we want latest and greated version number, no? 😜 Signed-off-by: Christian Hesse <mail@eworm.de> Change-Id: Ie890ace2e88dca0d7defb1cac5a2723699f794db
2021-09-15 r/2867 feat(3p/cgit): Highlight cheddar callout in about viewsVincent Ambo1-0/+26
Change-Id: Ica055ab621608ff78dbbf9ea9a2c9d1cdf2ff21e Reviewed-on: https://cl.tvl.fyi/c/depot/+/3556 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
2021-04-10 r/2461 refactor(third_party): Consistent use of depot.third_party vs. pkgsVincent Ambo1-4/+3
In preparation for the solution of b/108, we need to consistently use `depot.third_party` for packages that are only packed in the TVL depot and `pkgs` for things that come from nixpkgs. This commit cleans up a huge chunk of these uses in //third_party Change-Id: Ic382c0cdea7330a84d5f0b7d109c824ddceb94e7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2912 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
2021-04-06 r/2447 fix(3p/cgit): fix max-width for #summarysterni1-1/+1
Having a space between the number and the unit is not valid CSS. I was aware of this problem, but apparently forgot to amend the fix. Change-Id: I74936db515799763038669d0a11da53f28f722be Reviewed-on: https://cl.tvl.fyi/c/depot/+/2867 Tested-by: BuildkiteCI Reviewed-by: lukegb <lukegb@tvl.fyi>
2021-04-02 r/2400 feat(3p/cgit): limit width of div#summary, i. e. /about/**sterni2-0/+5
Decreased text width for the /about pages should increase readability considerably as jumping back to the beginning is hard for longer lines. The result is still not perfect as the font size for the /about pages is rather small and many lines thus get broken somewhat awkwardly. We could probably migitate that using a larger font size. The implementation choice of adding a tvl-extra.css which we inject into cgit.css in preBuild is for simplicity: We don't need to worry about routing an extra CSS file and loading it from the right location via extra cgit head entries and serving it at the correct location using either nginx or thttpd. A drawback of this is however that iteration is slowed down by cgit's compilation time. Additionally, this should be the basis for implementing a bubblegum themed cgit for Profpatsch. Change-Id: I18060f735167acd623cef7a17c83408978461249 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2756 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
2021-04-02 r/2397 feat(3p/cgit): enableParallelBuildingsterni1-0/+2
This gives a decent compilation speedup even on slow machines, so seems worth it. Let's hope the cgit build process is not racy. Change-Id: Ic4ae72789da2ccae16fd48e46aec624244b25035 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2755 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
2021-04-01 r/2390 chore(third_party/cgit): use lib instead of stdenv.libFlorian Klink1-5/+6
Getting `lib` from `stdenv.lib` is deprecated, and throws warnings. Change-Id: Ic925818c1b5a67d15d6d40ad784554328cd603e0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2751 Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-11-21 r/1892 fix(3p/cgit): Rename remaining 'sha1' references to 'oid'Vincent Ambo1-2/+2
This changed upstream & upstream-upstream, but was still used in our patches. Change-Id: Id33f868a4f188deb3348425276bc5b4c4b36aff9
2020-11-21 r/1891 merge(3p/cgit): subtree merge at adcc4f82Vincent Ambo26-135/+299
Change-Id: I16941629a17a2f39b9324cb85dc0cec6b104dfe4
2020-08-03 r/1558 fix(3p/cgit): transpose html_option parametersAlyssa Ross1-1/+1
I got these the wrong way round, fixed them in the patch in my Nix configuration, and then neglected to fix them in the version for depot. Fixes: be98295dc24492f6607cce04ba586e3897a83543 Change-Id: Ib7d4e433887f474ae9675e9948ab38f640181095 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1383 Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: kanepyork <rikingcoding@gmail.com> Tested-by: BuildkiteCI
2020-07-23 r/1434 feat(3p/cgit): add "this commit" option to switch formAlyssa Ross1-0/+12
Branches are grouped into their own section to make the "this commit" option visually distinct. Adding this option will result in two options being marked as selected if a branch has the same name as a commit oid. But that would cause all sorts of other problems anyway (attempting to switch to the branch would actually give you the commit, etc.), so let's not worry about that. A "permalink" link on the blob view next to the "plain" link would probably be more discoverable, but that would only work for the blob view. The switch UI is visible everywhere. This patch is in use already at <https://git.qyliss.net/> and <https://spectrum-os.org/git/>. Signed-off-by: Alyssa Ross <hi@alyssa.is> Message-Id: <20200723204820.16776-1-hi@alyssa.is> Cc: Profpatsch <mail@profpatsch.de> Change-Id: I7e88d1231dd402e0ad764e16b28e9a51964c6293 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1382 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
2020-06-03 r/878 fix(3p/cgit): Fix compilation under ClangLuke Granger-Brown2-2/+2
Clang treats function-like macros "correctly", in that, per the C11 spec: "Each subsequent instance of the function-like macro name followed by a ( [...] is replaced by the replacement list [...]". Additionally, fprintf is also permitted to be defined as a function-like macro rather than as a true function: "Any function declared in a header may be additionally implemented as a function-like macro defined in the header [...]". The specification then suggests surrounding the name of the function in parens to avoid this, which is the technique we use here to avoid the function-like macro being invoked. The other fix here is to use uintptr_t for some arithmetic, since Git is expecting an int as the value here and not a pointer.
2020-04-19 r/633 fix(third_party/cgit): Correctly make "about links" on about pageVincent Ambo1-0/+4
2020-02-21 feat(cgit/ui-commit): show subject in page titleC. McEnroe1-0/+1
2020-02-21 feat(cgit/ui-tree): show symlink targets in tree listingC. McEnroe1-2/+20
Add links to symbolic link targets in tree listings, formatted like "ls -l". Path normalization collapses any ".." components of the link.
2020-02-21 feat(cgit/ui-tree): don't link to blame for binary blobsC. McEnroe1-2/+4
2020-02-21 feat(cgit/ui-blame): bail if blob is binaryC. McEnroe1-0/+4
This avoids piping binary blobs through the source-filter.
2020-02-21 r/559 chore: Rename pkgs->depot in all Nix file headersVincent Ambo1-3/+3
2020-02-09 r/514 fix(third_party/cgit): Make vpath & repo available for about cmdVincent Ambo1-1/+1
This change makes cgit pass the current repo and vpath inside of the repo on to the about cmd, which makes it possible for it to correctly render `tree`, `log` and other links to the same vpath.
2020-01-18 r/402 chore(third_party/cgit): Remove git submoduleVincent Ambo2-3/+0
This is instead passed in by Nix, and it confuses git on clones.
2020-01-12 r/382 feat(third_party/cgit): Render timestamps in dottimeVincent Ambo4-8/+8
Using the DATE_DOTTIME format support in git.
2020-01-12 r/380 feat(third_party/cgit): Add derivation to build cgitVincent Ambo2-0/+38
This is pretty much exactly the derivation from nixpkgs, with some things removed to reduce the closure size (e.g. the various formatters used in the default cgit version, which are replaced by cheddar in my setup).
2020-01-11 r/377 feat(third_party/cgit): Generate links to about pages from subtreesVincent Ambo1-4/+10
If you're on tree/foo/bar, the about link will now point to about/foo/bar. Currently the annoying thing about this is that it will also do it for files.
2020-01-11 r/376 feat(third_party/cgit): Use README at each subtreeVincent Ambo1-0/+12
This means that individual subtrees of a repository will also have their READMEs rendered on the about page, for example: /foo/bar/README.md Will render on: /about/foo/bar/ This is useful for monorepo setups in which subtrees represent individual projects.
2020-01-11 r/375 feat(third_party/cgit): Generate monorepo compatible URLsVincent Ambo2-43/+10
Generates URLs that do not include the repository name. On git.tazj.in, only one repository (depot) is served - hence URLs generated by cgit need not include the name.
2020-01-11 r/371 merge(third_party/cgit): Import at master of 2020-01-11Vincent Ambo102-0/+15631
Imported commit '723dc8fbcb1a4609c264758eae420ee2811a2b55' as 'third_party/cgit'.
generated by cgit-pink 1.4.1 (git 2.44.2) at 2024-11-01T05·47+0000