Merge pull request #147411 from drupol/php/php-8.1.0

php: Init at 8.1.1
This commit is contained in:
Elis Hirwing 2021-12-21 12:33:07 +01:00 committed by GitHub
commit e3a7c62565
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 85 additions and 3 deletions

View file

@ -14,8 +14,13 @@
</itemizedlist>
<section xml:id="sec-release-22.05-highlights">
<title>Highlights</title>
<para>
</para>
<itemizedlist spacing="compact">
<listitem>
<para>
PHP 8.1 is now available
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-new-services">
<title>New Services</title>

View file

@ -6,6 +6,8 @@ In addition to numerous new and upgraded packages, this release has the followin
## Highlights {#sec-release-22.05-highlights}
- PHP 8.1 is now available
## New Services {#sec-release-22.05-new-services}
- [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).

View file

@ -362,6 +362,7 @@ in
php = handleTest ./php {};
php74 = handleTest ./php { php = pkgs.php74; };
php80 = handleTest ./php { php = pkgs.php80; };
php81 = handleTest ./php { php = pkgs.php81; };
pinnwand = handleTest ./pinnwand.nix {};
plasma5 = handleTest ./plasma5.nix {};
plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {};

View file

@ -0,0 +1,51 @@
{ callPackage, lib, stdenv, ... }@_args:
let
base = callPackage ./generic.nix (_args // {
version = "8.1.1";
sha256 = "sha256-j4vJytbNEk7cER99sKEJdF4vY4dwoQGzwiopU/eptA4=";
});
in
base.withExtensions ({ all, ... }: with all; ([
bcmath
calendar
curl
ctype
dom
exif
fileinfo
filter
ftp
gd
gettext
gmp
iconv
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
sqlite3
tokenizer
xmlreader
xmlwriter
zip
zlib
] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))

View file

@ -0,0 +1,12 @@
diff --git a/ext/tokenizer/Makefile.frag b/ext/tokenizer/Makefile.frag
index 745cbfce91..07bace6022 100644
--- a/ext/tokenizer/Makefile.frag
+++ b/ext/tokenizer/Makefile.frag
@@ -1,5 +1,5 @@
-$(top_srcdir)/ext/tokenizer/tokenizer_data.c: $(top_srcdir)/Zend/zend_language_parser.y
+$(top_srcdir)/tokenizer_data.c: $(top_srcdir)/../../Zend/zend_language_parser.y
@if test ! -z "$(PHP)"; then \
$(PHP) $(srcdir)/tokenizer_data_gen.php; \
fi;
-$(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.c $(top_srcdir)/Zend/zend_language_scanner.c
+$(builddir)/tokenizer.lo: $(top_srcdir)/../../Zend/zend_language_parser.c $(top_srcdir)/../../Zend/zend_language_scanner.c

View file

@ -13557,6 +13557,13 @@ with pkgs;
phpExtensions = php.extensions;
phpPackages = php.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;
};
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;

View file

@ -547,7 +547,11 @@ lib.makeScope pkgs.newScope (self: with self; {
{ name = "sysvsem"; }
{ name = "sysvshm"; }
{ name = "tidy"; configureFlags = [ "--with-tidy=${html-tidy}" ]; doCheck = false; }
{ name = "tokenizer"; }
{
name = "tokenizer";
patches = lib.optional (lib.versionAtLeast php.version "8.1")
../development/interpreters/php/fix-tokenizer-php81.patch;
}
{
name = "wddx";
buildInputs = [ libxml2 ];