diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-08 21:40:31 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-16 00:21:02 +0200 |
commit | 2053ddac783c931053676ebc2b02bc8b82d89399 (patch) | |
tree | 2f5a9533bc41a482533993f00c9fd3ca4d2b108b /modules/private/websites/tools/tools/adminer.nix | |
parent | 69e6151c0c324f920eccb34568ed7ff523592589 (diff) | |
download | Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.gz Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.zst Nix-2053ddac783c931053676ebc2b02bc8b82d89399.zip |
Upgrade nixos-unstable
Diffstat (limited to 'modules/private/websites/tools/tools/adminer.nix')
-rw-r--r-- | modules/private/websites/tools/tools/adminer.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix index af03550..a4ba344 100644 --- a/modules/private/websites/tools/tools/adminer.nix +++ b/modules/private/websites/tools/tools/adminer.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { adminer, php74, php74base, myPhpPackages, lib, forcePhpSocket ? null }: | 1 | { adminer, php74, myPhpPackages, lib, forcePhpSocket ? null }: |
2 | rec { | 2 | rec { |
3 | activationScript = { | 3 | activationScript = { |
4 | deps = [ "httpd" ]; | 4 | deps = [ "httpd" ]; |
@@ -10,7 +10,7 @@ rec { | |||
10 | phpFpm = rec { | 10 | phpFpm = rec { |
11 | user = apache.user; | 11 | user = apache.user; |
12 | group = apache.group; | 12 | group = apache.group; |
13 | phpPackage = php74base.withExtensions (e: (lib.remove e.mysqli php74.enabledExtensions) ++ [myPhpPackages.mysqli_pam]); | 13 | phpPackage = php74.withExtensions ({ enabled, all }: (lib.remove all.mysqli enabled) ++ [myPhpPackages.mysqli_pam]); |
14 | settings = { | 14 | settings = { |
15 | "listen.owner" = apache.user; | 15 | "listen.owner" = apache.user; |
16 | "listen.group" = apache.group; | 16 | "listen.group" = apache.group; |