movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge pull request #174555 from etu/php-drop-php74

Browse source 
php: Drop PHP 7.4
This commit is contained in:
Elis Hirwing 2022-06-10 10:43:31 +02:00 • committed by GitHub
commit 7afff45088
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 39 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/mail/postfixadmin.nix
View file

@ -177,7 +177,7 @@ in
services.phpfpm.pools.postfixadmin = {
user = user;
phpPackage = pkgs.php74;
phpPackage = pkgs.php81;
phpOptions = ''
error_log = 'stderr'
log_errors = on

4
nixos/modules/services/web-apps/dokuwiki.nix
View file

@ -293,9 +293,7 @@ in
inherit user;
group = webserver.group;
# Not yet compatible with php 8 https://www.dokuwiki.org/requirements
# https://github.com/splitbrain/dokuwiki/issues/3545
phpPackage = pkgs.php74;
phpPackage = pkgs.php81;
phpEnv = {
DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}";
DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}";

6
nixos/modules/services/web-apps/grocy.nix
View file

@ -115,9 +115,9 @@ in {
user = "grocy";
group = "nginx";
# PHP 7.4 is the only version which is supported/tested by upstream:
# https://github.com/grocy/grocy/blob/v3.0.0/README.md#how-to-install
phpPackage = pkgs.php74;
# PHP 8.0 is the only version which is supported/tested by upstream:
# https://github.com/grocy/grocy/blob/v3.3.0/README.md#how-to-install
phpPackage = pkgs.php80;
inherit (cfg.phpfpm) settings;

3
nixos/modules/services/web-apps/invoiceplane.nix
View file

@ -236,7 +236,7 @@ in
};
services.phpfpm = {
phpPackage = pkgs.php74;
phpPackage = pkgs.php81;
pools = mapAttrs' (hostName: cfg: (
nameValuePair "invoiceplane-${hostName}" {
inherit user;
@ -302,4 +302,3 @@ in
]);
}

2
nixos/modules/services/web-apps/moodle.nix
View file

@ -56,7 +56,7 @@ let
mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
phpExt = pkgs.php74.withExtensions
phpExt = pkgs.php81.withExtensions
({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache ]);
in
{

4
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -157,7 +157,7 @@ in {
};
phpPackage = mkOption {
type = types.package;
relatedPackages = [ "php74" "php80" "php81" ];
relatedPackages = [ "php80" "php81" ];
defaultText = "pkgs.php";
description = ''
PHP package to use for Nextcloud.
@ -632,7 +632,7 @@ in {
services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;
services.nextcloud.phpPackage =
if versionOlder cfg.package.version "21" then pkgs.php74
if versionOlder cfg.package.version "24" then pkgs.php80
# FIXME: Use PHP 8.1 with Nextcloud 24 and higher, once issues like this one are fixed:
#
# https://github.com/nextcloud/twofactor_totp/issues/1192

2
nixos/modules/services/web-apps/snipe-it.nix
View file

@ -344,7 +344,7 @@ in {
services.phpfpm.pools.snipe-it = {
inherit user group;
phpPackage = pkgs.php74;
phpPackage = pkgs.php81;
phpOptions = ''
post_max_size = ${cfg.maxUploadSize}
upload_max_filesize = ${cfg.maxUploadSize}