Skip to content

Commit

Permalink
Merge pull request NixOS#232276 from LeSuisse/broken-php80-packages
Browse files Browse the repository at this point in the history
grocy, limesurvey: mark as broken due to lack of PHP 8.1 compatibility
  • Loading branch information
Ma27 committed May 23, 2023
2 parents cab4887 + bc48fa8 commit c0bbece
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 3 additions & 1 deletion nixos/modules/services/web-apps/grocy.nix
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ in {

# 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;
# Compatibility with PHP 8.1 is available on their development branch:
# https://github.com/grocy/grocy/commit/38a4ad8ec480c29a1bff057b3482fd103b036848
phpPackage = pkgs.php81;

inherit (cfg.phpfpm) settings;

Expand Down
6 changes: 3 additions & 3 deletions nixos/modules/services/web-apps/limesurvey.nix
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ in

services.phpfpm.pools.limesurvey = {
inherit user group;
phpPackage = pkgs.php80;
phpPackage = pkgs.php81;
phpEnv.DBENGINE = "${cfg.database.dbEngine}";
phpEnv.LIMESURVEY_CONFIG = "${limesurveyConfig}";
settings = {
Expand Down Expand Up @@ -288,8 +288,8 @@ in
environment.LIMESURVEY_CONFIG = limesurveyConfig;
script = ''
# update or install the database as required
${pkgs.php80}/bin/php ${pkg}/share/limesurvey/application/commands/console.php updatedb || \
${pkgs.php80}/bin/php ${pkg}/share/limesurvey/application/commands/console.php install admin password admin admin@example.com verbose
${pkgs.php81}/bin/php ${pkg}/share/limesurvey/application/commands/console.php updatedb || \
${pkgs.php81}/bin/php ${pkg}/share/limesurvey/application/commands/console.php install admin password admin admin@example.com verbose
'';
serviceConfig = {
User = user;
Expand Down
1 change: 1 addition & 0 deletions pkgs/servers/grocy/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ma27 ];
description = "ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home";
homepage = "https://grocy.info/";
broken = true; # Not compatible with PHP 8.1
};
}
1 change: 1 addition & 0 deletions pkgs/servers/limesurvey/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.limesurvey.org";
maintainers = with maintainers; [offline];
platforms = with platforms; unix;
broken = true; # Not compatible with PHP 8.1
};
}

0 comments on commit c0bbece

Please sign in to comment.