git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #65846: Update php packages
commit387e6952d33f2fbe9b0de74e10bca167c2b87757 authorVladimír Čunát <v@cunat.cz> dateSat 10 Aug 2019, 14:42 (7 years ago) parent6c177c322d1795
2 files changed+39−18
pkgs/development/interpreters/php/default.nix+4−4 pkgs/top-level/php-packages.nix+35−14
pkgs/development/interpreters/php/default.nix+4−4
@@ -254,16 +254,16 @@ let
254254
255255in {
256256 php72 = generic {
257− version = "7.2.20";
258− sha256 = "116a1m0xjn2yi8d5kwzjk335q4brgl7xplcji2p87i2l9vjjkf4z";
257+ version = "7.2.21";
258+ sha256 = "1vqldc2namfblwyv87fgpfffkjpzawfpcp48f40nfdl3pshq6c9l";
259259
260260 # https://bugs.php.net/bug.php?id=76826
261261 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
262262 };
263263
264264 php73 = generic {
265− version = "7.3.7";
266− sha256 = "065z2q6imjxlbh6w1r7565ygqhigfbzcz70iaic74hj626kqyq63";
265+ version = "7.3.8";
266+ sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm";
267267
268268 # https://bugs.php.net/bug.php?id=76826
269269 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
pkgs/top-level/php-packages.nix+35−14
@@ -39,10 +39,10 @@ let
3939 };
4040
4141 ast = buildPecl rec {
42− version = "1.0.1";
42+ version = "1.0.3";
4343 pname = "ast";
4444
45− sha256 = "0ja74k2lmxwhhvp9y9kc7khijd7s2dqma5x8ghbhx9ajkn0wg8iq";
45+ sha256 = "1sk9bkyw3ck9jgvlazxx8zl2nv6lc0gq66v1rfcby9v0zyydb7xr";
4646 };
4747
4848 box = mkDerivation rec {
@@ -73,12 +73,12 @@ let
7373 };
7474
7575 composer = mkDerivation rec {
76− version = "1.8.6";
76+ version = "1.9.0";
7777 pname = "composer";
7878
7979 src = pkgs.fetchurl {
8080 url = "https://getcomposer.org/download/${version}/composer.phar";
81− sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn";
81+ sha256 = "0x88bin1c749ajymz2cqjx8660a3wxvndpv4xr6w3pib16fzdpy9";
8282 };
8383
8484 dontUnpack = true;
@@ -143,10 +143,10 @@ let
143143 };
144144
145145 event = buildPecl rec {
146− version = "2.5.2";
146+ version = "2.5.3";
147147 pname = "event";
148148
149− sha256 = "0b9zbwyyfcrzs1gcpqn2dkjq6jliw89g2m981f8ildbp84snkpcf";
149+ sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb";
150150
151151 configureFlags = [
152152 "--with-event-libevent-dir=${pkgs.libevent.dev}"
@@ -450,10 +450,10 @@ let
450450 };
451451
452452 protobuf = buildPecl rec {
453− version = "3.8.0";
453+ version = "3.9.0";
454454 pname = "protobuf";
455455
456− sha256 = "09zs7w9iv6432i0js44ihxymbd4pcxlprlzqkcjsxjpbprs4qpv2";
456+ sha256 = "1pyfxrfdbzzg5al4byyazdrvy7yad13zwq7papbb2d8gkvc3f3kh";
457457
458458 buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ];
459459
@@ -493,20 +493,41 @@ let
493493 };
494494 };
495495
496− pthreads = assert (pkgs.config.php.zts or false); buildPecl rec {
497− version = "3.1.5";
496+ pthreads = if isPhp73 then pthreads32-dev else pthreads32;
497+
498+ pthreads32 = assert (pkgs.config.php.zts or false); assert !isPhp73; buildPecl rec {
499+ version = "3.2.0";
498500 pname = "pthreads";
499501
500− sha256 = "1ziap0py3zrc7qj9lw4nzq6wx1viyj8v9y1babchizzan014x6p5";
502+ src = pkgs.fetchFromGitHub {
503+ owner = "krakjoe";
504+ repo = "pthreads";
505+ rev = "v${version}";
506+ sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv";
507+ };
501508
502− meta.broken = true;
509+ buildInputs = with pkgs; [ pcre.dev ];
510+ };
511+
512+ pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec {
513+ version = "3.2.0-dev";
514+ pname = "pthreads";
515+
516+ src = pkgs.fetchFromGitHub {
517+ owner = "krakjoe";
518+ repo = "pthreads";
519+ rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154";
520+ sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830";
521+ };
522+
523+ buildInputs = with pkgs; [ pcre2.dev ];
503524 };
504525
505526 redis = buildPecl rec {
506− version = "4.3.0";
527+ version = "5.0.2";
507528 pname = "redis";
508529
509− sha256 = "18hvll173mlp6dk6xvgajkjf4min8f5gn809nr1ahq4r6kn4rw60";
530+ sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f";
510531 };
511532
512533 sqlsrv = buildPecl rec {