aboutsummaryrefslogtreecommitdiff
path: root/modules/websites
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-07 11:58:37 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-07 11:58:37 +0200
commitdcac3ec730176549cd52a9a42db2001dc652c30d (patch)
tree451177d3f3905ae994b0a39806947ad404b292e8 /modules/websites
parent06029fac6a34ef8111ee2f2f07b2118ddb2e1559 (diff)
downloadNix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.gz
Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.zst
Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.zip
Remove overlay that overrides the php version
Diffstat (limited to 'modules/websites')
-rw-r--r--modules/websites/php-application.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/websites/php-application.nix b/modules/websites/php-application.nix
index 20e2a5d..23e2b23 100644
--- a/modules/websites/php-application.nix
+++ b/modules/websites/php-application.nix
@@ -1,4 +1,4 @@
1{ lib, config, ... }: 1{ lib, config, pkgs, ... }:
2with lib; 2with lib;
3let 3let
4 cfg = config.services.phpApplication; 4 cfg = config.services.phpApplication;
@@ -53,6 +53,11 @@ in
53 default = {}; 53 default = {};
54 description = "Pool environment to append"; 54 description = "Pool environment to append";
55 }; 55 };
56 phpPackage = mkOption {
57 type = attrsOf str;
58 default = pkgs.php;
59 description = "Php package to use";
60 };
56 phpOptions = mkOption { 61 phpOptions = mkOption {
57 type = lines; 62 type = lines;
58 default = ""; 63 default = "";
@@ -177,7 +182,7 @@ in
177 // optionalAttrs (icfg.phpSession) { "php_admin_value[session.save_path]" = "${icfg.varDir}/phpSessions"; } 182 // optionalAttrs (icfg.phpSession) { "php_admin_value[session.save_path]" = "${icfg.varDir}/phpSessions"; }
178 // icfg.phpPool; 183 // icfg.phpPool;
179 phpOptions = config.services.phpfpm.phpOptions + icfg.phpOptions; 184 phpOptions = config.services.phpfpm.phpOptions + icfg.phpOptions;
180 inherit (icfg) phpEnv; 185 inherit (icfg) phpEnv phpPackage;
181 } 186 }
182 ) cfg.apps; 187 ) cfg.apps;
183 188