diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 83520ae8c5f6..9f221679ce22 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -9,7 +9,7 @@ wide variety of extensions and libraries available. The different versions of PHP that nixpkgs provides are located under attributes named based on major and minor version number; e.g., -`php81` is PHP 8.1. +`php84` is PHP 8.4. Only versions of PHP that are supported by upstream for the entirety of a given NixOS release will be included in that release of @@ -22,8 +22,8 @@ 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 8.1 package, i.e. the unwrapped one, is available as -`php81.unwrapped`; see the next section for more details. +real PHP 8.4 package, i.e. the unwrapped one, is available as +`php84.unwrapped`; see the next section for more details. Interactive tools built on PHP are put in `php.packages`; composer is for example available at `php.packages.composer`. diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 7203addaa835..517beed6d0a4 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -328,6 +328,8 @@ Note that system activation will complete before all certificates may have been renewed or acquired. +- `php81` was removed. + - `libvirt` now supports using `nftables` backend. - The `virtualisation.libvirtd.firewallBackend` option can be used to configure the firewall backend used by libvirtd. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a4a8599a173c..6a98334eb836 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1171,10 +1171,6 @@ in inherit runTest; php = pkgs.php; }; - php81 = import ./php/default.nix { - inherit runTest; - php = pkgs.php81; - }; php82 = import ./php/default.nix { inherit runTest; php = pkgs.php82; diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix deleted file mode 100644 index cc5fef956dcf..000000000000 --- a/pkgs/development/interpreters/php/8.1.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ callPackage, fetchpatch, ... }@_args: - -let - base = callPackage ./generic.nix ( - (removeAttrs _args [ "fetchpatch" ]) - // { - version = "8.1.33"; - hash = "sha256-tlU0UYQcGlaYZdf9yDAkYh7kQ0zY+/6woxWIrJxwaF8="; - } - ); -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/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b326d227f8e..b9bd4de8e85d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2039,6 +2039,9 @@ mapAliases { pgadmin = pgadmin4; # Added 2022-01-14 pharo-spur64 = pharo; # Added 2022-08-03 phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27 + php81 = throw "php81 is EOL"; + php81Extensions = php81; + php81Packages = php81; picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f8c5ebc24aa..5c2abeee554e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6019,16 +6019,6 @@ with pkgs; php82Extensions = recurseIntoAttrs php82.extensions; php82Packages = recurseIntoAttrs php82.packages; - # Import PHP81 interpreter, extensions and packages - php81 = callPackage ../development/interpreters/php/8.1.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 - }; - }; - php81Extensions = recurseIntoAttrs php81.extensions; - php81Packages = recurseIntoAttrs php81.packages; - polyml = callPackage ../development/compilers/polyml { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };