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 | |
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')
4 files changed, 7 insertions, 7 deletions
diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index e6f8ecb..50ed528 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix | |||
@@ -171,7 +171,7 @@ in { | |||
171 | user = "wwwrun"; | 171 | user = "wwwrun"; |
172 | group = "wwwrun"; | 172 | group = "wwwrun"; |
173 | settings = phpFpm.pool; | 173 | settings = phpFpm.pool; |
174 | phpPackage = pkgs.php74.withExtensions(e: pkgs.php74.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); | 174 | phpPackage = pkgs.php74.withExtensions({ enabled, all }: enabled ++ [ all.redis all.apcu all.opcache ]); |
175 | }; | 175 | }; |
176 | 176 | ||
177 | services.cron = { | 177 | services.cron = { |
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix index 7c60ae4..4636a6c 100644 --- a/modules/private/websites/tools/mail/default.nix +++ b/modules/private/websites/tools/mail/default.nix | |||
@@ -65,7 +65,7 @@ in | |||
65 | phpOptions = config.services.phpfpm.phpOptions + '' | 65 | phpOptions = config.services.phpfpm.phpOptions + '' |
66 | date.timezone = 'CET' | 66 | date.timezone = 'CET' |
67 | ''; | 67 | ''; |
68 | phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.imagick ]); | 68 | phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.imagick ]); |
69 | }; | 69 | }; |
70 | services.phpfpm.pools.rainloop = { | 70 | services.phpfpm.pools.rainloop = { |
71 | user = "wwwrun"; | 71 | user = "wwwrun"; |
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; |
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 93d1122..1e30eed 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix | |||
@@ -17,7 +17,7 @@ let | |||
17 | wallabag = pkgs.callPackage ./wallabag.nix { | 17 | wallabag = pkgs.callPackage ./wallabag.nix { |
18 | wallabag = pkgs.webapps.wallabag.override { | 18 | wallabag = pkgs.webapps.wallabag.override { |
19 | composerEnv = pkgs.composerEnv.override { | 19 | composerEnv = pkgs.composerEnv.override { |
20 | php = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]); | 20 | php = pkgs.php73.withExtensions({ enabled, all }: enabled ++ [all.tidy]); |
21 | }; | 21 | }; |
22 | }; | 22 | }; |
23 | env = config.myEnv.tools.wallabag; | 23 | env = config.myEnv.tools.wallabag; |
@@ -324,7 +324,7 @@ in { | |||
324 | 324 | ||
325 | "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"; | 325 | "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"; |
326 | }; | 326 | }; |
327 | phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [e.mysqli e.redis e.apcu e.opcache ]); | 327 | phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [all.mysqli all.redis all.apcu all.opcache ]); |
328 | }; | 328 | }; |
329 | adminer = adminer.phpFpm; | 329 | adminer = adminer.phpFpm; |
330 | ttrss = { | 330 | ttrss = { |
@@ -337,7 +337,7 @@ in { | |||
337 | user = "wwwrun"; | 337 | user = "wwwrun"; |
338 | group = "wwwrun"; | 338 | group = "wwwrun"; |
339 | settings = wallabag.phpFpm.pool; | 339 | settings = wallabag.phpFpm.pool; |
340 | phpPackage = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]); | 340 | phpPackage = pkgs.php73.withExtensions({ enabled, all }: enabled ++ [all.tidy]); |
341 | }; | 341 | }; |
342 | yourls = { | 342 | yourls = { |
343 | user = "wwwrun"; | 343 | user = "wwwrun"; |