From 5d39f5fe43632d3c75d1153851053a17eb71214f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:58:38 +0000 Subject: [PATCH 1/8] php74Extensions.apcu: 5.1.20 -> 5.1.21 (cherry picked from commit 0ea3426d4da282d3abb392404f49c68610f7ce2c) --- pkgs/development/php-packages/apcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 0cfc7b4b44fd..150c761ae511 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "apcu"; - version = "5.1.20"; - sha256 = "sha256-uZ1A+v7Ab00TL87lPnUm3b/B0EHqbgThc4nfrSj5w5A="; + version = "5.1.21"; + sha256 = "sha256-EDNTBEhpbufK3shQUPbfUTX7EzAHLvKnRWk5Ks/s+8E="; buildInputs = [ pcre2 ]; doCheck = true; From 925a3bfbd777ed635c718e7e85219393d0157d0d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 25 Nov 2021 21:38:19 +0100 Subject: [PATCH 2/8] php81: init at 8.1.1 (cherry picked from commit 3d3479f717769a27e2a4a4e9d0b445cd2bf89dab) 22.05 release notes purged. --- nixos/tests/all-tests.nix | 1 + pkgs/development/interpreters/php/8.1.nix | 51 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++ 3 files changed, 59 insertions(+) create mode 100644 pkgs/development/interpreters/php/8.1.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 52637202b19c..970046e98a0a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -359,6 +359,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 {}; diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix new file mode 100644 index 000000000000..736d6c808cde --- /dev/null +++ b/pkgs/development/interpreters/php/8.1.nix @@ -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 ])) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3578924fde3..76cc5f30e2e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13544,6 +13544,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; From 528d3bff9a2b0be74252be01b724617c15a5509a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 20 Dec 2021 14:09:56 +0100 Subject: [PATCH 3/8] php81Extensions.tokenizer: fix build (cherry picked from commit cf7f4c058e822ee8eeaa2120c45f04b5b460a5db) (cherry picked from commit 2dbf96e7cc594162706e88e01f406e27ca8ebd82) --- .../interpreters/php/fix-tokenizer-php81.patch | 12 ++++++++++++ pkgs/top-level/php-packages.nix | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/php/fix-tokenizer-php81.patch diff --git a/pkgs/development/interpreters/php/fix-tokenizer-php81.patch b/pkgs/development/interpreters/php/fix-tokenizer-php81.patch new file mode 100644 index 000000000000..b43eeefa3c28 --- /dev/null +++ b/pkgs/development/interpreters/php/fix-tokenizer-php81.patch @@ -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 diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0aefbeee4e0a..ea36bf278c03 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -545,7 +545,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 ]; From b447ec0d0597ea72431b8ca4f12dbfd80013da7d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 22 Jan 2022 18:12:21 +0100 Subject: [PATCH 4/8] php81: 8.1.1 -> 8.1.2 (cherry picked from commit 6794a2c3f67a92f374e02c52edf6442b21a52ecb) --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- pkgs/top-level/php-packages.nix | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 736d6c808cde..d339e7801018 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.1"; - sha256 = "sha256-j4vJytbNEk7cER99sKEJdF4vY4dwoQGzwiopU/eptA4="; + version = "8.1.2"; + sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci"; }); in diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ea36bf278c03..c6df621c8436 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -538,7 +538,15 @@ lib.makeScope pkgs.newScope (self: with self; { ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; doCheck = false; } - { name = "sockets"; doCheck = false; } + { + name = "sockets"; + doCheck = false; + patches = lib.optional (php.version == "8.1.2") + (fetchpatch { + url = "https://github.com/php/php-src/commit/07aaa34cd418c44f7bc653fafbf49f07fc71b2bf.patch"; + sha256 = "sha256-EwVb09/zV2vJ8PuyLpKFCovxe6yKct0UBvishZaordM="; + }); + } { name = "sodium"; buildInputs = [ libsodium ]; } { name = "sqlite3"; buildInputs = [ sqlite ]; } { name = "sysvmsg"; } From 091967c67c0c31b7141c3058b83a76ac5cf94d44 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 20 Feb 2022 11:07:01 +0100 Subject: [PATCH 5/8] php81: 8.1.2 -> 8.1.3 (cherry picked from commit 96983152e7b0576dc0d0887a0e5610cffc8fd28e) --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- pkgs/top-level/php-packages.nix | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index d339e7801018..8d87a5e7a225 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.2"; - sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci"; + version = "8.1.3"; + sha256 = "sha256-NUxOLFBgRuyoEtH8JSaISi9UtePSDvDt6RmmnrIy0L4="; }); in diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c6df621c8436..bb30a46b8ca7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -541,11 +541,6 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "sockets"; doCheck = false; - patches = lib.optional (php.version == "8.1.2") - (fetchpatch { - url = "https://github.com/php/php-src/commit/07aaa34cd418c44f7bc653fafbf49f07fc71b2bf.patch"; - sha256 = "sha256-EwVb09/zV2vJ8PuyLpKFCovxe6yKct0UBvishZaordM="; - }); } { name = "sodium"; buildInputs = [ libsodium ]; } { name = "sqlite3"; buildInputs = [ sqlite ]; } From 8cd90f4f3c1183597ed300ff1f1db8ffdb95fc6e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 18 Mar 2022 13:23:25 +0100 Subject: [PATCH 6/8] php81: 8.1.3 -> 8.1.4 (cherry picked from commit a5911f15973f01567d104dd2944b58bea9830322) --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 8d87a5e7a225..aa98204b9979 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.3"; - sha256 = "sha256-NUxOLFBgRuyoEtH8JSaISi9UtePSDvDt6RmmnrIy0L4="; + version = "8.1.4"; + sha256 = "b3f688cb69758523838b8e7f509aaef0152133d9b84a84a0b7cf68eeafc1df76"; }); in From a85054fdeac496a7bcaa7627014f462063168906 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 13 Apr 2022 20:07:25 +0200 Subject: [PATCH 7/8] php81: 8.1.4 -> 8.1.5 (cherry picked from commit 47d7d171263ad4c7d65e38781db4b222b37fa916) --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index aa98204b9979..5c94f168866c 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.4"; - sha256 = "b3f688cb69758523838b8e7f509aaef0152133d9b84a84a0b7cf68eeafc1df76"; + version = "8.1.5"; + sha256 = "sha256-gn3lZ3HDq4MToGmBLxX27EmYnVEK69Dc4YCDnG2Nb/M="; }); in From db75a30cd42c9cc6f84da36c78ac26660476b434 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 13 May 2022 09:14:47 +0200 Subject: [PATCH 8/8] php81: 8.1.5 -> 8.1.6 (cherry picked from commit e76ad56103aaece64ab4f40969255c9f2a725429) --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 5c94f168866c..72d00639b622 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.5"; - sha256 = "sha256-gn3lZ3HDq4MToGmBLxX27EmYnVEK69Dc4YCDnG2Nb/M="; + version = "8.1.6"; + sha256 = "ezUzBLdAdVT3DT4QGiJqH8It7K5cTELtJwxOOJv6G2Y="; }); in