From 314c64c409455ee49665ab2c7262b28965d17390 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 16 May 2023 19:13:00 +0200 Subject: [PATCH 1/2] grocy: mark as broken grocy is not yet compatible with PHP 8.1 --- nixos/modules/services/web-apps/grocy.nix | 4 +++- pkgs/servers/grocy/default.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index 3bcda3caedaced3..688367cafaf55f2 100644 --- a/nixos/modules/services/web-apps/grocy.nix +++ b/nixos/modules/services/web-apps/grocy.nix @@ -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; diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 360f5202e28a266..bbae0f8f248fd3d 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -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 }; } From bc48fa8f5e3c09b1c401b21388f2f429df1ad536 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 16 May 2023 19:18:22 +0200 Subject: [PATCH 2/2] limesurvey: mark as broken limesurvey is not yet compatible with PHP 8.1. --- nixos/modules/services/web-apps/limesurvey.nix | 6 +++--- pkgs/servers/limesurvey/default.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 8e6b39cbdebcb43..920e6928ef5ceba 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -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 = { @@ -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; diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index ce75e8de8b5a328..b9eb173bb7d393b 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -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 }; }