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/ludivine | |
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/ludivine')
-rw-r--r-- | modules/private/websites/ludivine/integration.nix | 2 | ||||
-rw-r--r-- | modules/private/websites/ludivine/production.nix | 2 |
2 files changed, 4 insertions, 0 deletions
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 @@ | |||
2 | let | 2 | let |
3 | secrets = config.myEnv.websites.ludivine.integration; | 3 | secrets = config.myEnv.websites.ludivine.integration; |
4 | app = pkgs.callPackage ./app { | 4 | app = pkgs.callPackage ./app { |
5 | composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; | ||
5 | environment = secrets.environment; | 6 | environment = secrets.environment; |
6 | varDir = "/var/lib/ludivine_integration"; | 7 | varDir = "/var/lib/ludivine_integration"; |
7 | secretsPath = config.secrets.fullPaths."websites/ludivine/integration"; | 8 | secretsPath = config.secrets.fullPaths."websites/ludivine/integration"; |
@@ -46,6 +47,7 @@ in { | |||
46 | phpWatchFiles = [ | 47 | phpWatchFiles = [ |
47 | config.secrets.fullPaths."websites/ludivine/integration" | 48 | config.secrets.fullPaths."websites/ludivine/integration" |
48 | ]; | 49 | ]; |
50 | phpPackage = pkgs.php72; | ||
49 | }; | 51 | }; |
50 | 52 | ||
51 | secrets.keys = [ | 53 | 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 @@ | |||
2 | let | 2 | let |
3 | secrets = config.myEnv.websites.ludivine.production; | 3 | secrets = config.myEnv.websites.ludivine.production; |
4 | app = pkgs.callPackage ./app { | 4 | app = pkgs.callPackage ./app { |
5 | composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; | ||
5 | environment = secrets.environment; | 6 | environment = secrets.environment; |
6 | varDir = "/var/lib/ludivine_production"; | 7 | varDir = "/var/lib/ludivine_production"; |
7 | secretsPath = config.secrets.fullPaths."websites/ludivine/production"; | 8 | secretsPath = config.secrets.fullPaths."websites/ludivine/production"; |
@@ -48,6 +49,7 @@ in { | |||
48 | pkgs.imagemagick pkgs.sass pkgs.ruby | 49 | pkgs.imagemagick pkgs.sass pkgs.ruby |
49 | ]; | 50 | ]; |
50 | }; | 51 | }; |
52 | phpPackage = pkgs.php72; | ||
51 | }; | 53 | }; |
52 | 54 | ||
53 | secrets.keys = [ | 55 | secrets.keys = [ |