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/isabelle/aten_integration.nix | 2 ++
 modules/private/websites/isabelle/aten_production.nix  | 2 ++
 modules/private/websites/isabelle/iridologie.nix       | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix
index 61c35cc..6f8f985 100644
--- a/modules/private/websites/isabelle/aten_integration.nix
+++ b/modules/private/websites/isabelle/aten_integration.nix
@@ -2,6 +2,7 @@
 let
   secrets = config.myEnv.websites.isabelle.aten_integration;
   app = pkgs.callPackage ./aten_app {
+    composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
     environment = secrets.environment;
     varDir = "/var/lib/isabelle_aten_integration";
   };
@@ -37,6 +38,7 @@ in {
       phpEnv = {
         SYMFONY_DEBUG_MODE = "\"yes\"";
       };
+      phpPackage = pkgs.php72;
     };
 
     secrets.keys = [{
diff --git a/modules/private/websites/isabelle/aten_production.nix b/modules/private/websites/isabelle/aten_production.nix
index e34d659..4fa3622 100644
--- a/modules/private/websites/isabelle/aten_production.nix
+++ b/modules/private/websites/isabelle/aten_production.nix
@@ -2,6 +2,7 @@
 let
   secrets = config.myEnv.websites.isabelle.aten_production;
   app = pkgs.callPackage ./aten_app {
+    composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
     environment = secrets.environment;
     varDir = "/var/lib/isabelle_aten_production";
   };
@@ -37,6 +38,7 @@ in {
         "pm.min_spare_servers" = "1";
         "pm.max_spare_servers" = "3";
       };
+      phpPackage = pkgs.php72;
     };
 
     secrets.keys = [{
diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix
index 560e605..740a3c6 100644
--- a/modules/private/websites/isabelle/iridologie.nix
+++ b/modules/private/websites/isabelle/iridologie.nix
@@ -62,8 +62,9 @@ in {
         "pm.max_spare_servers" = "3";
       };
       phpOptions = config.services.phpfpm.phpOptions + ''
-        extension=${pkgs.php}/lib/php/extensions/mysqli.so
+        extension=${pkgs.php72}/lib/php/extensions/mysqli.so
       '';
+      phpPackage = pkgs.php72;
     };
     system.activationScripts.isabelle_iridologie = {
       deps = [ "wrappers" ];
-- 
cgit v1.2.3