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/ludivine/integration.nix | 2 ++
 modules/private/websites/ludivine/production.nix  | 2 ++
 2 files changed, 4 insertions(+)

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

diff --git a/modules/private/websites/ludivine/integration.nix b/modules/private/websites/ludivine/integration.nix
index 4e37c0c..4357b93 100644
--- a/modules/private/websites/ludivine/integration.nix
+++ b/modules/private/websites/ludivine/integration.nix
@@ -2,6 +2,7 @@
 let
   secrets = config.myEnv.websites.ludivine.integration;
   app = pkgs.callPackage ./app {
+    composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
     environment = secrets.environment;
     varDir = "/var/lib/ludivine_integration";
     secretsPath = config.secrets.fullPaths."websites/ludivine/integration";
@@ -46,6 +47,7 @@ in {
       phpWatchFiles = [
         config.secrets.fullPaths."websites/ludivine/integration"
       ];
+      phpPackage = pkgs.php72;
     };
 
     secrets.keys = [
diff --git a/modules/private/websites/ludivine/production.nix b/modules/private/websites/ludivine/production.nix
index 47450c5..b30f488 100644
--- a/modules/private/websites/ludivine/production.nix
+++ b/modules/private/websites/ludivine/production.nix
@@ -2,6 +2,7 @@
 let
   secrets = config.myEnv.websites.ludivine.production;
   app = pkgs.callPackage ./app {
+    composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
     environment = secrets.environment;
     varDir = "/var/lib/ludivine_production";
     secretsPath = config.secrets.fullPaths."websites/ludivine/production";
@@ -48,6 +49,7 @@ in {
           pkgs.imagemagick pkgs.sass pkgs.ruby
         ];
       };
+      phpPackage = pkgs.php72;
     };
 
     secrets.keys = [
-- 
cgit v1.2.3