From f93d637ef9368347d70857f1a1efef3f4439ee7e Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 6 Jun 2019 21:03:42 +0300 Subject: [PATCH 1/5] php: fix zts options --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 9a6b2f99f4a..ee980e1cdbc 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -48,7 +48,7 @@ let , ftpSupport ? config.php.ftp or true , fpmSupport ? config.php.fpm or true , gmpSupport ? config.php.gmp or true - , ztsSupport ? config.php.zts or false + , ztsSupport ? (config.php.zts or false) || (apxs2Support) , calendarSupport ? config.php.calendar or true , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2") , tidySupport ? (config.php.tidy or false) From 925f803e28b3b45692587bfedcf38491ad525534 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 6 Jun 2019 22:16:58 +0300 Subject: [PATCH 2/5] phpPackages: build phpPackages with re2c --- pkgs/build-support/build-pecl.nix | 4 ++-- pkgs/development/interpreters/php/default.nix | 6 ++---- pkgs/top-level/php-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index d08f8822d75..a1030e3b34f 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -1,4 +1,4 @@ -{ stdenv, php, autoreconfHook, fetchurl }: +{ stdenv, php, autoreconfHook, fetchurl, re2c }: { pname , version @@ -17,7 +17,7 @@ stdenv.mkDerivation (args // { inherit src; - nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs; + nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; buildInputs = [ php ] ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ee980e1cdbc..718a7963b2e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -59,8 +59,7 @@ let , cliSupport ? config.php.cli or true , pharSupport ? config.php.phar or true , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) - , re2cSupport ? config.php.re2c or true - , cgotoSupport ? (config.php.cgoto or false) && (re2cSupport) + , cgotoSupport ? config.php.cgoto or false , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2") , valgrindPcreSupport ? (config.php.valgrindPcreSupport or false) && (valgrindSupport) && (versionAtLeast version "7.2") }: @@ -76,7 +75,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf re2c ]; buildInputs = [ flex bison ] ++ optional (versionOlder version "7.3") pcre ++ optional (versionAtLeast version "7.3") pcre2 @@ -108,7 +107,6 @@ let ++ optional tidySupport html-tidy ++ optional argon2Support libargon2 ++ optional libzipSupport libzip - ++ optional re2cSupport re2c ++ optional valgrindSupport valgrind; CXXFLAGS = optional stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 119b99c3a56..72712001ba8 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -4,7 +4,7 @@ let self = with self; { buildPecl = import ../build-support/build-pecl.nix { inherit php; - inherit (pkgs) stdenv autoreconfHook fetchurl; + inherit (pkgs) stdenv autoreconfHook fetchurl re2c; }; # Wrap mkDerivation to prepend pname with "php-" to make names consistent @@ -216,7 +216,7 @@ let sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; - buildInputs = [ pkgs.re2c pkgs.oracle-instantclient ]; + buildInputs = [ pkgs.oracle-instantclient ]; configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ]; }; From a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 6 Jun 2019 23:06:10 +0300 Subject: [PATCH 3/5] php: update build config --- pkgs/development/interpreters/php/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 718a7963b2e..a4a0b41210a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,10 +1,10 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix -{ lib, stdenv, fetchurl, flex, bison, autoconf +{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c , mysql, libxml2, readline, zlib, curl, postgresql, gettext -, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype +, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 -, libzip, re2c, valgrind +, libzip, valgrind }: with lib; @@ -61,7 +61,6 @@ let , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) , cgotoSupport ? config.php.cgoto or false , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2") - , valgrindPcreSupport ? (config.php.valgrindPcreSupport or false) && (valgrindSupport) && (versionAtLeast version "7.2") }: let @@ -75,8 +74,8 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf re2c ]; - buildInputs = [ flex bison ] + nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ]; + buildInputs = [ ] ++ optional (versionOlder version "7.3") pcre ++ optional (versionAtLeast version "7.3") pcre2 ++ optional withSystemd systemd @@ -190,8 +189,7 @@ let ++ optional (!pharSupport) "--disable-phar" ++ optional xmlrpcSupport "--with-xmlrpc" ++ optional cgotoSupport "--enable-re2c-cgoto" - ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ optional valgrindPcreSupport "--with-pcre-valgrind"; + ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"; hardeningDisable = [ "bindnow" ]; From 59c4b84d65c63770675ceffca3fc838fd9854d0c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 6 Jun 2019 23:32:36 +0300 Subject: [PATCH 4/5] phpPackages.event: 2.5.1 -> 2.5.2 --- pkgs/top-level/php-packages.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 72712001ba8..bfc83961d86 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -143,12 +143,17 @@ let }; event = buildPecl rec { - version = "2.5.1"; + version = "2.5.2"; pname = "event"; - sha256 = "0hnvmlbl994fjliqc3c65gv6f6syh9zmlfcbizqs3k67bbmkhiad"; + sha256 = "0b9zbwyyfcrzs1gcpqn2dkjq6jliw89g2m981f8ildbp84snkpcf"; - configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" ]; + configureFlags = [ + "--with-event-libevent-dir=${pkgs.libevent.dev}" + "--with-event-core" + "--with-event-extra" + "--with-event-pthreads" + ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ openssl libevent ]; From d61323992e833c75e83882dababc3788634ab8b8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 11 Jun 2019 22:08:12 +0300 Subject: [PATCH 5/5] phpPackages.composer: 1.8.5 -> 1.8.6 --- 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 bfc83961d86..114b107418d 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.5"; + version = "1.8.6"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "05qfgh2dz8pjf47ndyhkicqbnqzwypk90cczd4c6d8jl9gbiqk2f"; + sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn"; }; unpackPhase = ":";