From 8d8932840ed20a2a518607cb684d4ba616d272e8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 12 Jan 2020 02:53:01 +0000 Subject: chore(web/cgit-taz): Use in-tree cgit version instead Drops the previous patch setup to use //third_party/cgit instead. --- web/cgit-taz/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'web/cgit-taz/default.nix') diff --git a/web/cgit-taz/default.nix b/web/cgit-taz/default.nix index 962efab91ac7..16a34472093b 100644 --- a/web/cgit-taz/default.nix +++ b/web/cgit-taz/default.nix @@ -9,15 +9,6 @@ with pkgs.third_party; let - # Patched version of cgit that has monorepo-specific features. - monocgit = cgit.overrideAttrs(old: { - patches = old.patches ++ [ - ./0001-cgit_monorepo_urls.patch - ./0002-cgit_subtree_readmes.patch - ./0003-cgit_subtree_about_links.patch - ]; - }); - cgitConfig = writeText "cgitrc" '' # Global configuration virtual-root=/ @@ -42,7 +33,7 @@ let thttpdConfig = writeText "thttpd.conf" '' port=8080 - dir=${monocgit}/cgit + dir=${cgit}/cgit nochroot novhost logfile=/dev/stdout @@ -77,4 +68,4 @@ let }); in writeShellScriptBin "cgit-launch" '' exec ${thttpdCgit}/bin/thttpd -D -C ${thttpdConfig} -# '' +'' -- cgit 1.4.1