summary refs log tree commit diff
path: root/fleet/hosts/trieste/cgit
diff options
context:
space:
mode:
authorV <v@unfathomable.blue>2022-06-02 18:44:20 +0200
committerV <v@unfathomable.blue>2022-06-04 00:19:22 +0200
commit69d03945f1027df7fc8d9d27a8be9d71712584f0 (patch)
tree7b45b3acc8b529b6d9b0c0623b16cd863664177c /fleet/hosts/trieste/cgit
parentae60d61097496b57ccb051db67d76e0f7a238741 (diff)
downloadunf-legacy-69d03945f1027df7fc8d9d27a8be9d71712584f0.tar.zst
fleet: upgrade to NixOS 22.05
Change-Id: Ie5542d079ee7b2de06e0faed52343905b3287b39
Diffstat (limited to 'fleet/hosts/trieste/cgit')
-rw-r--r--fleet/hosts/trieste/cgit/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/fleet/hosts/trieste/cgit/default.nix b/fleet/hosts/trieste/cgit/default.nix
index 880842b..17f3e4f 100644
--- a/fleet/hosts/trieste/cgit/default.nix
+++ b/fleet/hosts/trieste/cgit/default.nix
@@ -21,7 +21,7 @@ let
     '';
     passAsFile = [ "extraStyles" ];
   } ''
-    ${pkgs.minify}/bin/minify --type css ${pkgs.cgit}/cgit/cgit.css $extraStylesPath -o $out/cgit.css
+    ${pkgs.minify}/bin/minify --type css --bundle ${pkgs.cgit}/cgit/cgit.css $extraStylesPath -o $out/cgit.css
     cp ${./un.svg} $out/un.svg  # TODO(V): remove this variant, apply padding to the Sigil using CSS
     cp ${./unicon.svg} $out/unicon.svg  # This is the same as un.svg, but without any padding
     cp ${./ripple.svg} $out/ripple.svg  # This is referenced in git.nix (as config.cgit.logo, for Ripple)
@@ -75,7 +75,7 @@ in {
   };
 
   # TODO(V): set up git-http-backend. Disable enable-http-clone when we've done that?
-  services.caddy.config = ''
+  services.caddy.extraConfig = ''
     src.unfathomable.blue {
       import common