aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-07 23:03:42 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-07 23:03:42 +0200
commitc0d1c186b7811daaebea87563978c426856f28d0 (patch)
treec4e4795b15abde89fd5b30da50fe388eeecace40
parent5153eb54abab92497093fffa60c487c3523016d4 (diff)
downloadNix-c0d1c186b7811daaebea87563978c426856f28d0.tar.gz
Nix-c0d1c186b7811daaebea87563978c426856f28d0.tar.zst
Nix-c0d1c186b7811daaebea87563978c426856f28d0.zip
Upgrade php package for adminer
-rw-r--r--modules/private/websites/tools/tools/adminer.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index 52a132c..f892841 100644
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,4 +1,4 @@
1{ adminer, php73, forcePhpSocket ? null }: 1{ adminer, php74, forcePhpSocket ? null }:
2rec { 2rec {
3 activationScript = { 3 activationScript = {
4 deps = [ "httpd" ]; 4 deps = [ "httpd" ];
@@ -11,18 +11,7 @@ rec {
11 phpFpm = rec { 11 phpFpm = rec {
12 user = apache.user; 12 user = apache.user;
13 group = apache.group; 13 group = apache.group;
14 phpPackage = (php73.override { 14 phpPackage = php74;
15 config.php.mysqlnd = true;
16 config.php.mysqli = false;
17 config.php.pdo-mysql = false;
18 }).overrideAttrs(old: rec {
19 configureFlags = old.configureFlags ++ [
20 "--with-mysqli=shared,mysqlnd"
21 ];
22 });
23 phpOptions = ''
24 extension=${phpPackage}/lib/php/extensions/mysqli.so
25 '';
26 settings = { 15 settings = {
27 "listen.owner" = apache.user; 16 "listen.owner" = apache.user;
28 "listen.group" = apache.group; 17 "listen.group" = apache.group;