Merge pull request #53778 from etu/php-upgrades

php71: 7.1.25 -> 7.1.26, php72: 7.2.13 -> 7.2.14

pkgs/development/interpreters/php/default.nix

@@ -245,21 +245,19 @@ let
 
 in {
   php71 = generic {
-    version = "7.1.25";
+    version = "7.1.26";
-    sha256 = "1b5az5vhap593ggjxirs1zdlg20hcv9h94iq5kgaxky71a4dqb00";
+    sha256 = "1riaaizyl0jv9p6b8sm8xxj8iqz4p4dddwdag03n1r67dfl1qdav";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
   };
 
   php72 = generic {
-    version = "7.2.13";
+    version = "7.2.14";
-    sha256 = "0bg9nfc250p24hxn4bdjz7ngcw75h8rpf4qjxqzcs6s9fvxlcjjv";
+    sha256 = "15v5gbdxi6jkgdflpj5rqqzzfvwdb55hls4azh71xgy793934qgm";
 
-    # https://bugs.php.net/bug.php?id=71041
     # https://bugs.php.net/bug.php?id=76826
-    extraPatches = [ ./fix-bug-71041.patch ]
+    extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
-      ++ optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
   };
 
   php73 = generic {

pkgs/development/interpreters/php/fix-bug-71041.patch

@@ -1,25 +0,0 @@
-diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
-index 24d454d..6307620 100644
---- a/Zend/zend_signal.c
-+++ b/Zend/zend_signal.c
-@@ -399,7 +399,7 @@ void zend_signal_init(void) /* {{{ */
- 
- /* {{{ zend_signal_startup
-  * alloc zend signal globals */
--void zend_signal_startup(void)
-+ZEND_API void zend_signal_startup(void)
- {
- 
- #ifdef ZTS
-diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h
-index e8ee7d6..462d06f 100644
---- a/Zend/zend_signal.h
-+++ b/Zend/zend_signal.h
-@@ -89,7 +89,7 @@ ZEND_API void zend_signal_handler_unblock(void);
- void zend_signal_activate(void);
- void zend_signal_deactivate(void);
- BEGIN_EXTERN_C()
--void zend_signal_startup(void);
-+ZEND_API void zend_signal_startup(void);
- END_EXTERN_C()
- void zend_signal_init(void);