Unverified Commit 97d215cf authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: php: 8.3 -> 8.4 (#394112)

parents 9ccb4b42 90a0f387
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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.

+1 −1
Original line number Diff line number Diff line
@@ -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";
+1 −1
Original line number Diff line number Diff line
@@ -6862,7 +6862,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;