diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-07 11:58:37 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-07 11:58:37 +0200 |
commit | dcac3ec730176549cd52a9a42db2001dc652c30d (patch) | |
tree | 451177d3f3905ae994b0a39806947ad404b292e8 /modules/private/websites/tools/tools | |
parent | 06029fac6a34ef8111ee2f2f07b2118ddb2e1559 (diff) | |
download | Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.gz Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.zst Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.zip |
Remove overlay that overrides the php version
Diffstat (limited to 'modules/private/websites/tools/tools')
-rw-r--r-- | modules/private/websites/tools/tools/default.nix | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index a5e7f2e..dcda15a 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix | |||
@@ -9,12 +9,13 @@ let | |||
9 | ttrss = pkgs.callPackage ./ttrss.nix { | 9 | ttrss = pkgs.callPackage ./ttrss.nix { |
10 | inherit (pkgs.webapps) ttrss ttrss-plugins; | 10 | inherit (pkgs.webapps) ttrss ttrss-plugins; |
11 | env = config.myEnv.tools.ttrss; | 11 | env = config.myEnv.tools.ttrss; |
12 | php = pkgs.php72; | ||
12 | }; | 13 | }; |
13 | kanboard = pkgs.callPackage ./kanboard.nix { | 14 | kanboard = pkgs.callPackage ./kanboard.nix { |
14 | env = config.myEnv.tools.kanboard; | 15 | env = config.myEnv.tools.kanboard; |
15 | }; | 16 | }; |
16 | wallabag = pkgs.callPackage ./wallabag.nix { | 17 | wallabag = pkgs.callPackage ./wallabag.nix { |
17 | inherit (pkgs.webapps) wallabag; | 18 | wallabag = pkgs.webapps.wallabag.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; }; |
18 | env = config.myEnv.tools.wallabag; | 19 | env = config.myEnv.tools.wallabag; |
19 | }; | 20 | }; |
20 | yourls = pkgs.callPackage ./yourls.nix { | 21 | yourls = pkgs.callPackage ./yourls.nix { |
@@ -36,7 +37,7 @@ let | |||
36 | env = config.myEnv.tools.phpldapadmin; | 37 | env = config.myEnv.tools.phpldapadmin; |
37 | }; | 38 | }; |
38 | grocy = pkgs.callPackage ./grocy.nix { | 39 | grocy = pkgs.callPackage ./grocy.nix { |
39 | inherit (pkgs.webapps) grocy; | 40 | grocy = pkgs.webapps.grocy.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; }; |
40 | }; | 41 | }; |
41 | phpbb = pkgs.callPackage ./phpbb.nix { | 42 | phpbb = pkgs.callPackage ./phpbb.nix { |
42 | phpbb = (pkgs.webapps.phpbb.withLangs (l: [ l.fr ])).withExts (e: [ | 43 | phpbb = (pkgs.webapps.phpbb.withLangs (l: [ l.fr ])).withExts (e: [ |
@@ -260,7 +261,7 @@ in { | |||
260 | description = "Tiny Tiny RSS feeds update daemon"; | 261 | description = "Tiny Tiny RSS feeds update daemon"; |
261 | serviceConfig = { | 262 | serviceConfig = { |
262 | User = "wwwrun"; | 263 | User = "wwwrun"; |
263 | ExecStart = "${pkgs.php}/bin/php ${ttrss.webRoot}/update.php --daemon"; | 264 | ExecStart = "${pkgs.php72}/bin/php ${ttrss.webRoot}/update.php --daemon"; |
264 | StandardOutput = "syslog"; | 265 | StandardOutput = "syslog"; |
265 | StandardError = "syslog"; | 266 | StandardError = "syslog"; |
266 | PermissionsStartOnly = true; | 267 | PermissionsStartOnly = true; |
@@ -300,6 +301,7 @@ in { | |||
300 | phpEnv = { | 301 | phpEnv = { |
301 | CONTACT_EMAIL = config.myEnv.tools.contact; | 302 | CONTACT_EMAIL = config.myEnv.tools.contact; |
302 | }; | 303 | }; |
304 | phpPackage = pkgs.php72; | ||
303 | }; | 305 | }; |
304 | devtools = { | 306 | devtools = { |
305 | user = "wwwrun"; | 307 | user = "wwwrun"; |
@@ -316,37 +318,43 @@ in { | |||
316 | "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"; | 318 | "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"; |
317 | }; | 319 | }; |
318 | phpOptions = config.services.phpfpm.phpOptions + '' | 320 | phpOptions = config.services.phpfpm.phpOptions + '' |
319 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 321 | extension=${pkgs.php72}/lib/php/extensions/mysqli.so |
320 | extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so | 322 | extension=${pkgs.php72Packages.redis}/lib/php/extensions/redis.so |
321 | extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so | 323 | extension=${pkgs.php72Packages.apcu}/lib/php/extensions/apcu.so |
322 | zend_extension=${pkgs.php}/lib/php/extensions/opcache.so | 324 | zend_extension=${pkgs.php72}/lib/php/extensions/opcache.so |
323 | ''; | 325 | ''; |
326 | phpPackage = pkgs.php72; | ||
324 | }; | 327 | }; |
325 | adminer = adminer.phpFpm; | 328 | adminer = adminer.phpFpm; |
326 | ttrss = { | 329 | ttrss = { |
327 | user = "wwwrun"; | 330 | user = "wwwrun"; |
328 | group = "wwwrun"; | 331 | group = "wwwrun"; |
329 | settings = ttrss.phpFpm.pool; | 332 | settings = ttrss.phpFpm.pool; |
333 | phpPackage = pkgs.php72; | ||
330 | }; | 334 | }; |
331 | wallabag = { | 335 | wallabag = { |
332 | user = "wwwrun"; | 336 | user = "wwwrun"; |
333 | group = "wwwrun"; | 337 | group = "wwwrun"; |
334 | settings = wallabag.phpFpm.pool; | 338 | settings = wallabag.phpFpm.pool; |
339 | phpPackage = pkgs.php72; | ||
335 | }; | 340 | }; |
336 | yourls = { | 341 | yourls = { |
337 | user = "wwwrun"; | 342 | user = "wwwrun"; |
338 | group = "wwwrun"; | 343 | group = "wwwrun"; |
339 | settings = yourls.phpFpm.pool; | 344 | settings = yourls.phpFpm.pool; |
345 | phpPackage = pkgs.php72; | ||
340 | }; | 346 | }; |
341 | rompr = { | 347 | rompr = { |
342 | user = "wwwrun"; | 348 | user = "wwwrun"; |
343 | group = "wwwrun"; | 349 | group = "wwwrun"; |
344 | settings = rompr.phpFpm.pool; | 350 | settings = rompr.phpFpm.pool; |
351 | phpPackage = pkgs.php72; | ||
345 | }; | 352 | }; |
346 | shaarli = { | 353 | shaarli = { |
347 | user = "wwwrun"; | 354 | user = "wwwrun"; |
348 | group = "wwwrun"; | 355 | group = "wwwrun"; |
349 | settings = shaarli.phpFpm.pool; | 356 | settings = shaarli.phpFpm.pool; |
357 | phpPackage = pkgs.php72; | ||
350 | }; | 358 | }; |
351 | dmarc-reports = { | 359 | dmarc-reports = { |
352 | user = "wwwrun"; | 360 | user = "wwwrun"; |
@@ -354,18 +362,21 @@ in { | |||
354 | settings = dmarc-reports.phpFpm.pool; | 362 | settings = dmarc-reports.phpFpm.pool; |
355 | phpEnv = dmarc-reports.phpFpm.phpEnv; | 363 | phpEnv = dmarc-reports.phpFpm.phpEnv; |
356 | phpOptions = config.services.phpfpm.phpOptions + '' | 364 | phpOptions = config.services.phpfpm.phpOptions + '' |
357 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 365 | extension=${pkgs.php72}/lib/php/extensions/mysqli.so |
358 | ''; | 366 | ''; |
367 | phpPackage = pkgs.php72; | ||
359 | }; | 368 | }; |
360 | dokuwiki = { | 369 | dokuwiki = { |
361 | user = "wwwrun"; | 370 | user = "wwwrun"; |
362 | group = "wwwrun"; | 371 | group = "wwwrun"; |
363 | settings = dokuwiki.phpFpm.pool; | 372 | settings = dokuwiki.phpFpm.pool; |
373 | phpPackage = pkgs.php72; | ||
364 | }; | 374 | }; |
365 | phpbb = { | 375 | phpbb = { |
366 | user = "wwwrun"; | 376 | user = "wwwrun"; |
367 | group = "wwwrun"; | 377 | group = "wwwrun"; |
368 | settings = phpbb.phpFpm.pool; | 378 | settings = phpbb.phpFpm.pool; |
379 | phpPackage = pkgs.php72; | ||
369 | }; | 380 | }; |
370 | ldap = { | 381 | ldap = { |
371 | user = "wwwrun"; | 382 | user = "wwwrun"; |
@@ -377,11 +388,13 @@ in { | |||
377 | user = "wwwrun"; | 388 | user = "wwwrun"; |
378 | group = "wwwrun"; | 389 | group = "wwwrun"; |
379 | settings = kanboard.phpFpm.pool; | 390 | settings = kanboard.phpFpm.pool; |
391 | phpPackage = pkgs.php72; | ||
380 | }; | 392 | }; |
381 | grocy = { | 393 | grocy = { |
382 | user = "wwwrun"; | 394 | user = "wwwrun"; |
383 | group = "wwwrun"; | 395 | group = "wwwrun"; |
384 | settings = grocy.phpFpm.pool; | 396 | settings = grocy.phpFpm.pool; |
397 | phpPackage = pkgs.php72; | ||
385 | }; | 398 | }; |
386 | }; | 399 | }; |
387 | 400 | ||