diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 5f7b1fc811c..7ac120b693f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -17,7 +17,7 @@ - PHP now defaults to PHP 8.0, updated from 7.4 + PHP now defaults to PHP 8.0, updated from 7.4. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 439437f5c09..577d7592935 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -6,6 +6,8 @@ In addition to numerous new and upgraded packages, this release has the followin ## Highlights +* PHP now defaults to PHP 8.0, updated from 7.4. + ## New Services * [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/applications/misc/rss-bridge-cli/default.nix index 7550e6bcb95..05d2bca99b1 100644 --- a/pkgs/applications/misc/rss-bridge-cli/default.nix +++ b/pkgs/applications/misc/rss-bridge-cli/default.nix @@ -6,7 +6,6 @@ let curl filter iconv - json mbstring openssl simplexml diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 24d4e02a328..6d6bdf76e40 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -14,7 +14,6 @@ buildPecl { }; configureFlags = [ "--with-couchbase" ]; - broken = lib.versionAtLeast php.version "8.0"; buildInputs = [ libcouchbase zlib ]; internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; @@ -45,5 +44,6 @@ buildPecl { '') ]; + meta.broken = lib.versionAtLeast php.version "8.0"; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/php-packages/php_excel/default.nix b/pkgs/development/php-packages/php_excel/default.nix index 8b83f558a53..4effddaed49 100644 --- a/pkgs/development/php-packages/php_excel/default.nix +++ b/pkgs/development/php-packages/php_excel/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, fetchurl, lib, libxl }: +{ buildPecl, fetchurl, lib, libxl, php }: let pname = "php_excel"; phpVersion = "php7"; @@ -20,5 +20,6 @@ buildPecl { "--with-libxl-libdir=${libxl}/lib" ]; + meta.broken = lib.versionAtLeast php.version "8.0"; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a4661c18e3..1adc52577e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1091,7 +1091,7 @@ in }) arangodb_3_3 arangodb_3_4 arangodb_3_5; arangodb = arangodb_3_4; - arcanist = callPackage ../development/tools/misc/arcanist {}; + arcanist = callPackage ../development/tools/misc/arcanist { php = php74; }; arduino = arduino-core.override { withGui = true; }; @@ -12288,7 +12288,7 @@ in # PHP interpreters, packages and extensions. # # Set default PHP interpreter, extensions and packages - php = php74; + php = php80; phpExtensions = php.extensions; phpPackages = php.packages; @@ -19059,7 +19059,7 @@ in dspam = callPackage ../servers/mail/dspam { }; - engelsystem = callPackage ../servers/web-apps/engelsystem { }; + engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { }; @@ -24940,7 +24940,7 @@ in lrzsz = callPackage ../tools/misc/lrzsz { }; - lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; + lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php74; }; luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };