From d783555924484bdeaaed86ca5e80fa1e20491e54 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Mar 2025 22:13:39 +0100
Subject: [PATCH 1/2] php: 8.3 -> 8.4

The default PHP is now the latest version of the interpreter available.
---
 nixos/doc/manual/release-notes/rl-2505.section.md | 2 +-
 pkgs/top-level/all-packages.nix                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 80ab576b438c..39b1bfd8e3fc 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -23,7 +23,7 @@
   NEWS can been viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.
   It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30).
 
-- The default PHP version has been updated to 8.3.
+- The default PHP version has been updated to 8.4.
 
 - The default Erlang OTP version has been updated to 27.
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cd23798359f..1314d0d99b4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6869,7 +6869,7 @@ with pkgs;
   # PHP interpreters, packages and extensions.
   #
   # Set default PHP interpreter, extensions and packages
-  php = php83;
+  php = php84;
   phpExtensions = php.extensions;
   phpPackages = php.packages;
 

From 90a0f3874f32dd3d2ebacfab52ca830da9ed40f2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Mar 2025 22:46:39 +0100
Subject: [PATCH 2/2] nixos/selfoss: pin to php83

https://github.com/NixOS/nixpkgs/pull/394112#pullrequestreview-2726857849
---
 nixos/modules/services/web-apps/selfoss.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix
index 81701f2cc001..47ca75f00794 100644
--- a/nixos/modules/services/web-apps/selfoss.nix
+++ b/nixos/modules/services/web-apps/selfoss.nix
@@ -158,7 +158,7 @@ in
 
     systemd.services.selfoss-update = {
       serviceConfig = {
-        ExecStart = "${pkgs.php}/bin/php ${dataDir}/cliupdate.php";
+        ExecStart = "${pkgs.php83}/bin/php ${dataDir}/cliupdate.php";
         User = "${cfg.user}";
       };
       startAt = "hourly";