From 7819d3f621548e06e1968d2be49bd258a50a5cfc Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 16:23:41 +0300 Subject: [PATCH 1/9] php72: 7.2.20 -> 7.2.21 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ea314789ce78..71e528696954 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -254,8 +254,8 @@ let in { php72 = generic { - version = "7.2.20"; - sha256 = "116a1m0xjn2yi8d5kwzjk335q4brgl7xplcji2p87i2l9vjjkf4z"; + version = "7.2.21"; + sha256 = "1vqldc2namfblwyv87fgpfffkjpzawfpcp48f40nfdl3pshq6c9l"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; From cb9846c2dcf0bd377178e927942cdd3f85d8239e Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 16:40:08 +0300 Subject: [PATCH 2/9] php73: 7.3.7 -> 7.3.8 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 71e528696954..17a56665c5a8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -262,8 +262,8 @@ in { }; php73 = generic { - version = "7.3.7"; - sha256 = "065z2q6imjxlbh6w1r7565ygqhigfbzcz70iaic74hj626kqyq63"; + version = "7.3.8"; + sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; From 60d61749b17bce630f0f7f99ca2c46e79faae2cf Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 16:42:26 +0300 Subject: [PATCH 3/9] phpPackages.composer: 1.8.6 -> 1.9.0 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3b7bb5692a22..5066501f281f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -73,12 +73,12 @@ let }; composer = mkDerivation rec { - version = "1.8.6"; + version = "1.9.0"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn"; + sha256 = "0x88bin1c749ajymz2cqjx8660a3wxvndpv4xr6w3pib16fzdpy9"; }; dontUnpack = true; From da7f227480a622d89c7616555c761967b32d4f34 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 16:44:03 +0300 Subject: [PATCH 4/9] phpPackages.event: 2.5.2 -> 2.5.3 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5066501f281f..cf1d98cd514c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -143,10 +143,10 @@ let }; event = buildPecl rec { - version = "2.5.2"; + version = "2.5.3"; pname = "event"; - sha256 = "0b9zbwyyfcrzs1gcpqn2dkjq6jliw89g2m981f8ildbp84snkpcf"; + sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" From 4e21f11fef51ccfedaea95032432fc76df0856ba Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 17:05:24 +0300 Subject: [PATCH 5/9] phpPackages.ast: 1.0.1 -> 1.0.3 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cf1d98cd514c..77cd0d370dcd 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -39,10 +39,10 @@ let }; ast = buildPecl rec { - version = "1.0.1"; + version = "1.0.3"; pname = "ast"; - sha256 = "0ja74k2lmxwhhvp9y9kc7khijd7s2dqma5x8ghbhx9ajkn0wg8iq"; + sha256 = "1sk9bkyw3ck9jgvlazxx8zl2nv6lc0gq66v1rfcby9v0zyydb7xr"; }; box = mkDerivation rec { From 84663166590a1cbca8fe318be90493ec3eee9f03 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 17:11:46 +0300 Subject: [PATCH 6/9] phpPackages.protobuf: 3.8.0 -> 3.9.0 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 77cd0d370dcd..5c7fb516859e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -450,10 +450,10 @@ let }; protobuf = buildPecl rec { - version = "3.8.0"; + version = "3.9.0"; pname = "protobuf"; - sha256 = "09zs7w9iv6432i0js44ihxymbd4pcxlprlzqkcjsxjpbprs4qpv2"; + sha256 = "1pyfxrfdbzzg5al4byyazdrvy7yad13zwq7papbb2d8gkvc3f3kh"; buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; From b864d2dc29a043c2a9842a1c53791a29783f9413 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 17:19:40 +0300 Subject: [PATCH 7/9] phpPackages.pthreads: 3.1.5 -> 3.2.0 --- pkgs/top-level/php-packages.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5c7fb516859e..2d23c51398aa 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -493,13 +493,18 @@ let }; }; - pthreads = assert (pkgs.config.php.zts or false); buildPecl rec { - version = "3.1.5"; + pthreads = assert (pkgs.config.php.zts or false); assert !isPhp73; buildPecl rec { + version = "3.2.0"; pname = "pthreads"; - sha256 = "1ziap0py3zrc7qj9lw4nzq6wx1viyj8v9y1babchizzan014x6p5"; + src = pkgs.fetchFromGitHub { + owner = "krakjoe"; + repo = "pthreads"; + rev = "v${version}"; + sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; + }; - meta.broken = true; + buildInputs = with pkgs; [ pcre.dev ]; }; redis = buildPecl rec { From 39da057b4c55a6dad3dae0e38352ee8ae501e9f0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 17:23:14 +0300 Subject: [PATCH 8/9] phpPackages.pthreads: init at 3.2.0-dev --- pkgs/top-level/php-packages.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2d23c51398aa..79a17acd46a5 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -493,7 +493,9 @@ let }; }; - pthreads = assert (pkgs.config.php.zts or false); assert !isPhp73; buildPecl rec { + pthreads = if isPhp73 then pthreads32-dev else pthreads32; + + pthreads32 = assert (pkgs.config.php.zts or false); assert !isPhp73; buildPecl rec { version = "3.2.0"; pname = "pthreads"; @@ -507,6 +509,20 @@ let buildInputs = with pkgs; [ pcre.dev ]; }; + pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec { + version = "3.2.0-dev"; + pname = "pthreads"; + + src = pkgs.fetchFromGitHub { + owner = "krakjoe"; + repo = "pthreads"; + rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; + sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; + }; + + buildInputs = with pkgs; [ pcre2.dev ]; + }; + redis = buildPecl rec { version = "4.3.0"; pname = "redis"; From 22d179593ceee518efeb775ba0619c25337bbe63 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 3 Aug 2019 17:25:46 +0300 Subject: [PATCH 9/9] phpPackages.redis: 4.3.0 -> 5.0.2 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 79a17acd46a5..d4694981fa64 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -524,10 +524,10 @@ let }; redis = buildPecl rec { - version = "4.3.0"; + version = "5.0.2"; pname = "redis"; - sha256 = "18hvll173mlp6dk6xvgajkjf4min8f5gn809nr1ahq4r6kn4rw60"; + sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f"; }; sqlsrv = buildPecl rec {