diff options
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters/php/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/interpreters/php/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix index 9a82868b7b3..6d0aeb78156 100644 --- a/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -1,6 +1,6 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix { lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c -, mysql, libxml2, readline, zlib, curl, postgresql, gettext +, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext , 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 @@ -64,7 +64,7 @@ let }: let - mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c; + mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient; libmcrypt' = libmcrypt.override { disablePosixThreads = true; }; in stdenv.mkDerivation { @@ -149,9 +149,9 @@ let ++ optional postgresqlSupport "--with-pgsql=${postgresql}" ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}" ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" - ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}" + ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}" ++ optionals mysqliSupport [ - "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}" + "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}" ] ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock" ++ optional bcmathSupport "--enable-bcmath" @@ -254,16 +254,16 @@ let in { php72 = generic { - version = "7.2.22"; - sha256 = "12phn0rrd5r1j6xlz83h7v6gszmj4lb5gwj927psbbc6nn1rh2n1"; + version = "7.2.23"; + sha256 = "03a3snx8wdn2pwfy8qdk035da9g3qdnpgqvpz4qfgmr97mjg6ym1"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.9"; - sha256 = "1i33v50rbqrfwjwch1d46mbpwbxrg1xfycs9mjl7xsy9m04rg753"; + version = "7.3.10"; + sha256 = "0j2lqiw8miv9aqg55z2dvfg3mwm5vyqx6ggmfbw013zvq1qxhvah"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; |