diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-15 23:30:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-15 23:30:30 +0200 |
| commit | d3d465e32f53dd88c2b4229c207ff7d005098f1d (patch) | |
| tree | b5d3d2fbef1440b2bb16b750051a374984551ec3 | |
| parent | 7b93f7a264330138fd706d84b445f0eed21211fa (diff) | |
| parent | 89b7ad263e9c3df23bac10cab3044883e7ebd766 (diff) | |
| download | nixlib-d3d465e32f53dd88c2b4229c207ff7d005098f1d.tar nixlib-d3d465e32f53dd88c2b4229c207ff7d005098f1d.tar.gz nixlib-d3d465e32f53dd88c2b4229c207ff7d005098f1d.tar.bz2 nixlib-d3d465e32f53dd88c2b4229c207ff7d005098f1d.tar.lz nixlib-d3d465e32f53dd88c2b4229c207ff7d005098f1d.tar.xz nixlib-d3d465e32f53dd88c2b4229c207ff7d005098f1d.tar.zst nixlib-d3d465e32f53dd88c2b4229c207ff7d005098f1d.zip | |
Merge pull request #46694 from etu/upgrade-php-7210
php: 7.2.8 -> 7.2.10, 7.1.21 -> 7.1.22
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 37a51ffded31..8310f381fcf0 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -37,7 +37,10 @@ let , opensslSupport ? config.php.openssl or true , mbstringSupport ? config.php.mbstring or true , gdSupport ? config.php.gd or true - , intlSupport ? config.php.intl or true + # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826 + # We need to disable the intl support on darwin. Whenever the upstream bug is + # fixed we should revert this to just just "config.php.intl or true". + , intlSupport ? (config.php.intl or true) && (!stdenv.isDarwin) , exifSupport ? config.php.exif or true , xslSupport ? config.php.xsl or false , mcryptSupport ? config.php.mcrypt or true @@ -220,12 +223,12 @@ let in { php71 = generic { - version = "7.1.21"; - sha256 = "104mn4kppklb21hgz1a50kgmc0ak5y996sx990xpc8yy9dbrqh62"; + version = "7.1.22"; + sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8"; }; php72 = generic { - version = "7.2.8"; - sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z"; + version = "7.2.10"; + sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1"; }; } |