diff options
| author | lassulus <git@lassul.us> | 2023-06-21 16:01:33 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-06-21 16:01:33 +0200 |
| commit | a0c4427c0baa94603fa10c1248944e7837e72642 (patch) | |
| tree | caa4053366d62b683e6f6e746e9df0317de88c80 /krebs/3modules/git.nix | |
| parent | c6593fdb393a585e631b9824e2bb3857ba2f90c6 (diff) | |
| parent | fdc364520238a38883d28bbfa05ac966e792ed8b (diff) | |
Merge remote-tracking branch 'ni/flakify'
Diffstat (limited to 'krebs/3modules/git.nix')
| -rw-r--r-- | krebs/3modules/git.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 02c673e4..1ec216f6 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -6,14 +6,14 @@ # TODO when authorized_keys changes, then restart ssh # (or kill already connected users somehow) -with import <stockholm/lib>; +with import ../../lib/pure.nix { inherit lib; }; let cfg = config.krebs.git; out = { options.krebs.git = api; - config = with lib; mkIf cfg.enable (mkMerge [ - (mkIf cfg.cgit.enable cgit-imp) + config = with lib; lib.mkIf cfg.enable (mkMerge [ + (lib.mkIf cfg.cgit.enable cgit-imp) git-imp ]); }; @@ -446,7 +446,7 @@ let ]; locations."/".extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; - fastcgi_param SCRIPT_FILENAME ${pkgs.writeDash "cgit-wrapper" '' + fastcgi_param SCRIPT_FILENAME ${pkgs.writers.writeDash "cgit-wrapper" '' set -efu exec 3>&1 ${pkgs.cgit}/cgit/cgit.cgi "$@" 2>&1 >&3 3>&- \ |