about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <Vincent Ambo>2020-01-12T02·53+0000
committerVincent Ambo <Vincent Ambo>2020-01-12T02·53+0000
commit8d8932840ed20a2a518607cb684d4ba616d272e8 (patch)
treee91cc546f836defc0747bcfe61dd514294bd46c3
parentac6485efeb05404cd8ac675adf54caa65deb0786 (diff)
chore(web/cgit-taz): Use in-tree cgit version instead r/381
Drops the previous patch setup to use //third_party/cgit instead.
-rw-r--r--web/cgit-taz/default.nix13
1 files changed, 2 insertions, 11 deletions
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}
-# ''
+''