Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

php: drop PHP 8.0 #239049

Merged
merged 2 commits into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/languages-frameworks/php.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2311.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/dokuwiki.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/nextcloud.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down
53 changes: 0 additions & 53 deletions pkgs/development/interpreters/php/8.0.nix

This file was deleted.

3 changes: 1 addition & 2 deletions pkgs/development/interpreters/php/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/tools/misc/n98-magerun/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php80 }:
{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php81 }:

let
pname = "n98-magerun";
Expand All @@ -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
Expand All @@ -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
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down