diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/cgit-taz/default.nix | 14 | ||||
| -rw-r--r-- | web/converse/default.nix | 4 | ||||
| -rw-r--r-- | web/todolist/default.nix | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/web/cgit-taz/default.nix b/web/cgit-taz/default.nix index 636695c883..f2f47e5793 100644 --- a/web/cgit-taz/default.nix +++ b/web/cgit-taz/default.nix @@ -1,11 +1,15 @@ # This derivation configures a 'cgit' instance to serve repositories # from a different source. - -{ depot, ... }: - -with depot.third_party; +{ depot, pkgs, ... }: let + inherit (pkgs) + mime-types + thttpd + writeShellScriptBin + writeText + ; + sourceFilter = writeShellScriptBin "cheddar-about" '' exec ${depot.tools.cheddar}/bin/cheddar --about-filter $@ ''; @@ -33,7 +37,7 @@ let thttpdConfig = writeText "thttpd.conf" '' port=2448 - dir=${cgit}/cgit + dir=${depot.third_party.cgit}/cgit nochroot novhost cgipat=**.cgi diff --git a/web/converse/default.nix b/web/converse/default.nix index a750671196..cc2dab7f88 100644 --- a/web/converse/default.nix +++ b/web/converse/default.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +{ depot, pkgs, ... }: -pkgs.naersk.buildPackage { +depot.third_party.naersk.buildPackage { src = ./.; buildInputs = with pkgs; [ openssl postgresql.lib ]; nativeBuildInputs = [ pkgs.pkgconfig ]; diff --git a/web/todolist/default.nix b/web/todolist/default.nix index 47640c8741..c9efbc03f9 100644 --- a/web/todolist/default.nix +++ b/web/todolist/default.nix @@ -2,12 +2,12 @@ # # Only TODOs that match the form 'TODO($username)' are considered, and # only for users that are known to us. -{ depot, lib, ... }: +{ depot, lib, pkgs, ... }: with depot.nix.yants; let - inherit (depot.third_party) + inherit (pkgs) jq ripgrep runCommandNoCC |