lol

Merge pull request #201000 from drupol/php/8.2.0

php82: init at 8.2.0rc6

authored by

Elis Hirwing and committed by
GitHub
14cc62d7 9e69c9c3

+104 -9
+5
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
··· 141 141 </listitem> 142 142 <listitem> 143 143 <para> 144 + PHP 8.2.0 RC 6 is available. 145 + </para> 146 + </listitem> 147 + <listitem> 148 + <para> 144 149 <literal>protonup</literal> has been aliased to and replaced 145 150 by <literal>protonup-ng</literal> due to upstream not 146 151 maintaining it.
+2
nixos/doc/manual/release-notes/rl-2211.section.md
··· 57 57 `mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a 58 58 common practice for a long time in other distributions. 59 59 60 + - PHP 8.2.0 RC 6 is available. 61 + 60 62 - `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it. 61 63 62 64 - Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default.
+1
nixos/tests/all-tests.nix
··· 495 495 php = handleTest ./php {}; 496 496 php80 = handleTest ./php { php = pkgs.php80; }; 497 497 php81 = handleTest ./php { php = pkgs.php81; }; 498 + php82 = handleTest ./php { php = pkgs.php82; }; 498 499 phylactery = handleTest ./web-apps/phylactery.nix {}; 499 500 pict-rs = handleTest ./pict-rs.nix {}; 500 501 pinnwand = handleTest ./pinnwand.nix {};
+61
pkgs/development/interpreters/php/8.2.nix
··· 1 + { callPackage, lib, stdenv, fetchurl, ... }@_args: 2 + 3 + let 4 + hash = "sha256-sbT8sIwle3OugXxqLZO3jKXlrOQsX1iH7WRH8G+nv8Y="; 5 + 6 + base = callPackage ./generic.nix (_args // { 7 + version = "8.2.0"; 8 + phpAttrsOverrides = attrs: attrs // { 9 + src = fetchurl { 10 + url = "https://downloads.php.net/~sergey/php-8.2.0RC6.tar.xz"; 11 + inherit hash; 12 + }; 13 + }; 14 + inherit hash; 15 + }); 16 + 17 + in 18 + base.withExtensions ({ all, ... }: with all; ([ 19 + bcmath 20 + calendar 21 + curl 22 + ctype 23 + dom 24 + exif 25 + fileinfo 26 + filter 27 + ftp 28 + gd 29 + gettext 30 + gmp 31 + iconv 32 + imap 33 + intl 34 + ldap 35 + mbstring 36 + mysqli 37 + mysqlnd 38 + opcache 39 + openssl 40 + pcntl 41 + pdo 42 + pdo_mysql 43 + pdo_odbc 44 + pdo_pgsql 45 + pdo_sqlite 46 + pgsql 47 + posix 48 + readline 49 + session 50 + simplexml 51 + sockets 52 + soap 53 + sodium 54 + sysvsem 55 + sqlite3 56 + tokenizer 57 + xmlreader 58 + xmlwriter 59 + zip 60 + zlib 61 + ]))
+2 -1
pkgs/development/php-packages/datadog_trace/default.nix
··· 1 - { buildPecl, curl, fetchFromGitHub, lib, pcre2 }: 1 + { buildPecl, curl, fetchFromGitHub, lib, pcre2, php }: 2 2 3 3 buildPecl rec { 4 4 pname = "ddtrace"; ··· 14 14 buildInputs = [ curl pcre2 ]; 15 15 16 16 meta = with lib; { 17 + broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. 17 18 description = "Datadog Tracing PHP Client"; 18 19 homepage = "https://github.com/DataDog/dd-trace-php"; 19 20 license = licenses.apsl20;
+2 -1
pkgs/development/php-packages/gnupg/default.nix
··· 1 - { buildPecl, lib, gpgme, file, gnupg }: 1 + { buildPecl, lib, gpgme, file, gnupg, php }: 2 2 3 3 buildPecl { 4 4 pname = "gnupg"; ··· 29 29 doCheck = true; 30 30 31 31 meta = with lib; { 32 + broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. 32 33 description = "PHP wrapper for GpgME library that provides access to GnuPG"; 33 34 license = licenses.bsd3; 34 35 homepage = "https://pecl.php.net/package/gnupg";
+10 -4
pkgs/development/php-packages/oci8/default.nix
··· 1 - { buildPecl, lib, oracle-instantclient }: 1 + { buildPecl, lib, oracle-instantclient, php }: 2 + 2 3 let 3 - version = "3.0.1"; 4 - sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; 4 + versionData = if (lib.versionOlder php.version "8.1") then { 5 + version = "3.0.1"; 6 + sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; 7 + } else { 8 + version = "3.2.1"; 9 + sha256 = "zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg="; 10 + }; 5 11 in 6 12 buildPecl { 7 13 pname = "oci8"; 8 14 9 - inherit version sha256; 15 + inherit (versionData) version sha256; 10 16 11 17 buildInputs = [ oracle-instantclient ]; 12 18 configureFlags = [ "--with-oci8=shared,instantclient,${oracle-instantclient.lib}/lib" ];
+11 -3
pkgs/development/php-packages/xdebug/default.nix
··· 1 - { buildPecl, lib }: 1 + { buildPecl, lib, php }: 2 2 3 + let 4 + versionData = if (lib.versionOlder php.version "8.1") then { 5 + version = "3.1.6"; 6 + sha256 = "1lnmrb5kgq8lbhjs48j3wwhqgk44pnqb1yjq4b5r6ysv9l5wlkjm"; 7 + } else { 8 + version = "3.2.0RC2"; 9 + sha256 = "dQgXDP3Ifg+D0niWxaJ4ec71Vfr8KH40jv6QbxSyY+4="; 10 + }; 11 + in 3 12 buildPecl { 4 13 pname = "xdebug"; 5 14 6 - version = "3.1.6"; 7 - sha256 = "1lnmrb5kgq8lbhjs48j3wwhqgk44pnqb1yjq4b5r6ysv9l5wlkjm"; 15 + inherit (versionData) version sha256; 8 16 9 17 doCheck = true; 10 18 checkTarget = "test";
+10
pkgs/top-level/all-packages.nix
··· 15788 15788 phpExtensions = php.extensions; 15789 15789 phpPackages = php.packages; 15790 15790 15791 + # Import PHP82 interpreter, extensions and packages 15792 + php82 = callPackage ../development/interpreters/php/8.2.nix { 15793 + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; 15794 + pcre2 = pcre2.override { 15795 + withJitSealloc = !stdenv.isDarwin; 15796 + }; 15797 + }; 15798 + php82Extensions = recurseIntoAttrs php82.extensions; 15799 + php82Packages = recurseIntoAttrs php82.packages; 15800 + 15791 15801 # Import PHP81 interpreter, extensions and packages 15792 15802 php81 = callPackage ../development/interpreters/php/8.1.nix { 15793 15803 stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;