git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #62783 from Izorkin/php-packages

php: update build config and php package

commit039983bd7a491e0ce9eebff761e7b9c3cce6b696 authorElis Hirwing <elis@hirwing.se> dateWed 12 Jun 2019, 13:14 (7 years ago) parent734b3e7d613239
3 files changed+22−21
pkgs/build-support/build-pecl.nix+2−2 pkgs/development/interpreters/php/default.nix+8−12 pkgs/top-level/php-packages.nix+12−7
pkgs/build-support/build-pecl.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, php, autoreconfHook, fetchurl }:
1+{ stdenv, php, autoreconfHook, fetchurl, re2c }:
22
33{ pname
44, version
@@ -17,7 +17,7 @@ stdenv.mkDerivation (args // {
1717
1818 inherit src;
1919
20− nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
20+ nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs;
2121 buildInputs = [ php ] ++ buildInputs;
2222
2323 makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
pkgs/development/interpreters/php/default.nix+8−12
@@ -1,10 +1,10 @@
11# pcre functionality is tested in nixos/tests/php-pcre.nix
2−{ lib, stdenv, fetchurl, flex, bison, autoconf
2+{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
33, mysql, libxml2, readline, zlib, curl, postgresql, gettext
4−, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype
4+, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
55, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
66, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
7−, libzip, re2c, valgrind
7+, libzip, valgrind
88}:
99
1010with lib;
@@ -48,7 +48,7 @@ let
4848 , ftpSupport ? config.php.ftp or true
4949 , fpmSupport ? config.php.fpm or true
5050 , gmpSupport ? config.php.gmp or true
51− , ztsSupport ? config.php.zts or false
51+ , ztsSupport ? (config.php.zts or false) || (apxs2Support)
5252 , calendarSupport ? config.php.calendar or true
5353 , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
5454 , tidySupport ? (config.php.tidy or false)
@@ -59,10 +59,8 @@ let
5959 , cliSupport ? config.php.cli or true
6060 , pharSupport ? config.php.phar or true
6161 , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
62− , re2cSupport ? config.php.re2c or true
63− , cgotoSupport ? (config.php.cgoto or false) && (re2cSupport)
62+ , cgotoSupport ? config.php.cgoto or false
6463 , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
65− , valgrindPcreSupport ? (config.php.valgrindPcreSupport or false) && (valgrindSupport) && (versionAtLeast version "7.2")
6664 }:
6765
6866 let
@@ -76,8 +74,8 @@ let
7674
7775 enableParallelBuilding = true;
7876
79− nativeBuildInputs = [ pkgconfig autoconf ];
80− buildInputs = [ flex bison ]
77+ nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ];
78+ buildInputs = [ ]
8179 ++ optional (versionOlder version "7.3") pcre
8280 ++ optional (versionAtLeast version "7.3") pcre2
8381 ++ optional withSystemd systemd
@@ -108,7 +106,6 @@ let
108106 ++ optional tidySupport html-tidy
109107 ++ optional argon2Support libargon2
110108 ++ optional libzipSupport libzip
111− ++ optional re2cSupport re2c
112109 ++ optional valgrindSupport valgrind;
113110
114111 CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
@@ -192,8 +189,7 @@ let
192189 ++ optional (!pharSupport) "--disable-phar"
193190 ++ optional xmlrpcSupport "--with-xmlrpc"
194191 ++ optional cgotoSupport "--enable-re2c-cgoto"
195− ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"
196− ++ optional valgrindPcreSupport "--with-pcre-valgrind";
192+ ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}";
197193
198194 hardeningDisable = [ "bindnow" ];
199195
pkgs/top-level/php-packages.nix+12−7
@@ -4,7 +4,7 @@ let
44 self = with self; {
55 buildPecl = import ../build-support/build-pecl.nix {
66 inherit php;
7− inherit (pkgs) stdenv autoreconfHook fetchurl;
7+ inherit (pkgs) stdenv autoreconfHook fetchurl re2c;
88 };
99
1010 # Wrap mkDerivation to prepend pname with "php-" to make names consistent
@@ -73,12 +73,12 @@ let
7373 };
7474
7575 composer = mkDerivation rec {
76− version = "1.8.5";
76+ version = "1.8.6";
7777 pname = "composer";
7878
7979 src = pkgs.fetchurl {
8080 url = "https://getcomposer.org/download/${version}/composer.phar";
81− sha256 = "05qfgh2dz8pjf47ndyhkicqbnqzwypk90cczd4c6d8jl9gbiqk2f";
81+ sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn";
8282 };
8383
8484 unpackPhase = ":";
@@ -143,12 +143,17 @@ let
143143 };
144144
145145 event = buildPecl rec {
146− version = "2.5.1";
146+ version = "2.5.2";
147147 pname = "event";
148148
149− sha256 = "0hnvmlbl994fjliqc3c65gv6f6syh9zmlfcbizqs3k67bbmkhiad";
149+ sha256 = "0b9zbwyyfcrzs1gcpqn2dkjq6jliw89g2m981f8ildbp84snkpcf";
150150
151− configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" ];
151+ configureFlags = [
152+ "--with-event-libevent-dir=${pkgs.libevent.dev}"
153+ "--with-event-core"
154+ "--with-event-extra"
155+ "--with-event-pthreads"
156+ ];
152157 nativeBuildInputs = [ pkgs.pkgconfig ];
153158 buildInputs = with pkgs; [ openssl libevent ];
154159
@@ -216,7 +221,7 @@ let
216221
217222 sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd";
218223
219− buildInputs = [ pkgs.re2c pkgs.oracle-instantclient ];
224+ buildInputs = [ pkgs.oracle-instantclient ];
220225 configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ];
221226 };
222227