diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 8600e49d4570f..6c4315f5c4876 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -22,7 +22,7 @@ NixOS - not necessarily the latest major release from upstream. All available PHP attributes are wrappers around their respective binary PHP package and provide commonly used extensions this way. The -real PHP 7.4 package, i.e. the unwrapped one, is available as +real PHP 8.1 package, i.e. the unwrapped one, is available as `php81.unwrapped`; see the next section for more details. Interactive tools built on PHP are put in `php.packages`; composer is diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index fd710aa1bf88f..a6a4d2e6b8eaf 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -34,6 +34,8 @@ - The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream. +- `php80` is no longer supported due to upstream not supporting this version anymore. + - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. - The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`. diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 9e685c127da74..9e9bfb1bfd839 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -337,7 +337,7 @@ let phpPackage = mkOption { type = types.package; - relatedPackages = [ "php80" "php81" ]; + relatedPackages = [ "php81" "php82" ]; default = pkgs.php81; defaultText = "pkgs.php81"; description = lib.mdDoc '' diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a4ec579fddba3..06af9d933e084 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -211,7 +211,7 @@ in { }; phpPackage = mkOption { type = types.package; - relatedPackages = [ "php80" "php81" ]; + relatedPackages = [ "php81" "php82" ]; defaultText = "pkgs.php"; description = lib.mdDoc '' PHP package to use for Nextcloud. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f97bb0f1bf4ed..318b1bc1f3131 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -593,7 +593,6 @@ in { phosh = handleTest ./phosh.nix {}; photoprism = handleTest ./photoprism.nix {}; php = handleTest ./php {}; - php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; php82 = handleTest ./php { php = pkgs.php82; }; phylactery = handleTest ./web-apps/phylactery.nix {}; diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix deleted file mode 100644 index 7de152f25c342..0000000000000 --- a/pkgs/development/interpreters/php/8.0.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ callPackage, lib, stdenv, ... }@_args: - -let - base = callPackage ./generic.nix (_args // { - version = "8.0.29"; - hash = "sha256-SAGh8OFxcChnI6tUrNBFrHipZWAh1W8QSmRUPuySLhI="; - }); - -in -base.withExtensions ({ all, ... }: with all; ([ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - imap - intl - ldap - mbstring - mysqli - mysqlnd - opcache - openssl - pcntl - pdo - pdo_mysql - pdo_odbc - pdo_pgsql - pdo_sqlite - pgsql - posix - readline - session - simplexml - sockets - soap - sodium - sysvsem - sqlite3 - tokenizer - xmlreader - xmlwriter - zip - zlib -])) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 6351eacd658e2..4a563d4fd70ec 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -247,8 +247,7 @@ let ++ lib.optional (!ipv6Support) "--disable-ipv6" ++ lib.optional systemdSupport "--with-fpm-systemd" ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" - ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" + ++ lib.optional ztsSupport "--enable-zts" # Sendmail diff --git a/pkgs/development/tools/misc/n98-magerun/default.nix b/pkgs/development/tools/misc/n98-magerun/default.nix index 062cb39d62d4c..9b3fb21602cce 100644 --- a/pkgs/development/tools/misc/n98-magerun/default.nix +++ b/pkgs/development/tools/misc/n98-magerun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php80 }: +{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php81 }: let pname = "n98-magerun"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { runHook preInstall mkdir -p $out/bin install -D $src/n98-magerun $out/libexec/n98-magerun/n98-magerun-${version}.phar - makeWrapper ${php80}/bin/php $out/bin/n98-magerun \ + makeWrapper ${php81}/bin/php $out/bin/n98-magerun \ --add-flags "$out/libexec/n98-magerun/n98-magerun-${version}.phar" \ --prefix PATH : ${lib.makeBinPath [ unzip ]} runHook postInstall @@ -34,5 +34,6 @@ stdenv.mkDerivation { homepage = "https://magerun.net/"; changelog = "https://magerun.net/category/magerun/"; maintainers = teams.php.members; + broken = true; # Not compatible with PHP 8.1, see https://github.com/netz98/n98-magerun/issues/1275 }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a6cd4fd2aa284..b900ab03e9ed3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1263,6 +1263,10 @@ mapAliases ({ phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24 # Obsolete PHP version aliases + php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 + php80Packages = php80; # Added 2023-06-21 + php80Extensions = php80; # Added 2023-06-21 + php74 = throw "php74 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2022-05-24 php74Packages = php74; # Added 2022-05-24 php74Extensions = php74; # Added 2022-05-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1475bea3971e8..f5f6e1714f4e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17314,16 +17314,6 @@ with pkgs; php81Extensions = recurseIntoAttrs php81.extensions; php81Packages = recurseIntoAttrs php81.packages; - # Import PHP80 interpreter, extensions and packages - php80 = callPackage ../development/interpreters/php/8.0.nix { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - pcre2 = pcre2.override { - withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 - }; - }; - php80Extensions = recurseIntoAttrs php80.extensions; - php80Packages = recurseIntoAttrs php80.packages; - phpactor = callPackage ../development/tools/phpactor { }; picoc = callPackage ../development/interpreters/picoc { };