From dcac3ec730176549cd52a9a42db2001dc652c30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 7 May 2020 11:58:37 +0200
Subject: Remove overlay that overrides the php version

---
 modules/private/websites/tools/tools/default.nix | 29 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'modules/private/websites/tools/tools')

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
   ttrss = pkgs.callPackage ./ttrss.nix {
     inherit (pkgs.webapps) ttrss ttrss-plugins;
     env = config.myEnv.tools.ttrss;
+    php = pkgs.php72;
   };
   kanboard = pkgs.callPackage ./kanboard.nix  {
     env = config.myEnv.tools.kanboard;
   };
   wallabag = pkgs.callPackage ./wallabag.nix {
-    inherit (pkgs.webapps) wallabag;
+    wallabag = pkgs.webapps.wallabag.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; };
     env = config.myEnv.tools.wallabag;
   };
   yourls = pkgs.callPackage ./yourls.nix {
@@ -36,7 +37,7 @@ let
     env = config.myEnv.tools.phpldapadmin;
   };
   grocy = pkgs.callPackage ./grocy.nix {
-    inherit (pkgs.webapps) grocy;
+    grocy = pkgs.webapps.grocy.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; };
   };
   phpbb = pkgs.callPackage ./phpbb.nix {
     phpbb = (pkgs.webapps.phpbb.withLangs (l: [ l.fr ])).withExts (e: [
@@ -260,7 +261,7 @@ in {
         description = "Tiny Tiny RSS feeds update daemon";
         serviceConfig = {
           User = "wwwrun";
-          ExecStart = "${pkgs.php}/bin/php ${ttrss.webRoot}/update.php --daemon";
+          ExecStart = "${pkgs.php72}/bin/php ${ttrss.webRoot}/update.php --daemon";
           StandardOutput = "syslog";
           StandardError = "syslog";
           PermissionsStartOnly = true;
@@ -300,6 +301,7 @@ in {
         phpEnv = {
           CONTACT_EMAIL = config.myEnv.tools.contact;
         };
+        phpPackage = pkgs.php72;
       };
       devtools = {
         user = "wwwrun";
@@ -316,37 +318,43 @@ in {
           "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp";
         };
         phpOptions = config.services.phpfpm.phpOptions + ''
-          extension=${pkgs.php}/lib/php/extensions/mysqli.so
-          extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
-          extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
-          zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
+          extension=${pkgs.php72}/lib/php/extensions/mysqli.so
+          extension=${pkgs.php72Packages.redis}/lib/php/extensions/redis.so
+          extension=${pkgs.php72Packages.apcu}/lib/php/extensions/apcu.so
+          zend_extension=${pkgs.php72}/lib/php/extensions/opcache.so
           '';
+        phpPackage = pkgs.php72;
       };
       adminer = adminer.phpFpm;
       ttrss = {
         user = "wwwrun";
         group = "wwwrun";
         settings = ttrss.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       wallabag = {
         user = "wwwrun";
         group = "wwwrun";
         settings = wallabag.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       yourls = {
         user = "wwwrun";
         group = "wwwrun";
         settings = yourls.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       rompr = {
         user = "wwwrun";
         group = "wwwrun";
         settings = rompr.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       shaarli = {
         user = "wwwrun";
         group = "wwwrun";
         settings = shaarli.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       dmarc-reports = {
         user = "wwwrun";
@@ -354,18 +362,21 @@ in {
         settings = dmarc-reports.phpFpm.pool;
         phpEnv = dmarc-reports.phpFpm.phpEnv;
         phpOptions = config.services.phpfpm.phpOptions + ''
-          extension=${pkgs.php}/lib/php/extensions/mysqli.so
+          extension=${pkgs.php72}/lib/php/extensions/mysqli.so
         '';
+        phpPackage = pkgs.php72;
       };
       dokuwiki = {
         user = "wwwrun";
         group = "wwwrun";
         settings = dokuwiki.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       phpbb = {
         user = "wwwrun";
         group = "wwwrun";
         settings = phpbb.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       ldap = {
         user = "wwwrun";
@@ -377,11 +388,13 @@ in {
         user = "wwwrun";
         group = "wwwrun";
         settings = kanboard.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       grocy = {
         user = "wwwrun";
         group = "wwwrun";
         settings = grocy.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
     };
 
-- 
cgit v1.2.3