From ab341a18ad6cf6bf9c90966151da2eb6e234061f Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 10 Jan 2019 21:22:04 +0100
Subject: php72: 7.2.13 -> 7.2.14

Changelog: http://php.net/ChangeLog-7.php#7.2.14
---
 pkgs/development/interpreters/php/default.nix      |  8 +++----
 .../interpreters/php/fix-bug-71041.patch           | 25 ----------------------
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/interpreters/php/fix-bug-71041.patch

(limited to 'pkgs/development/interpreters')

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index d890b1862d3b..7040e5883942 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -253,13 +253,11 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.13";
-    sha256 = "0bg9nfc250p24hxn4bdjz7ngcw75h8rpf4qjxqzcs6s9fvxlcjjv";
+    version = "7.2.14";
+    sha256 = "15v5gbdxi6jkgdflpj5rqqzzfvwdb55hls4azh71xgy793934qgm";
 
-    # https://bugs.php.net/bug.php?id=71041
     # https://bugs.php.net/bug.php?id=76826
-    extraPatches = [ ./fix-bug-71041.patch ]
-      ++ optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
+    extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
   };
 
   php73 = generic {
diff --git a/pkgs/development/interpreters/php/fix-bug-71041.patch b/pkgs/development/interpreters/php/fix-bug-71041.patch
deleted file mode 100644
index 350b635bdf36..000000000000
--- a/pkgs/development/interpreters/php/fix-bug-71041.patch
+++ /dev/null
@@ -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);
-- 
cgit 1.4.1


From 49538f6b3abde8c329477edc857a405f67ba299a Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 10 Jan 2019 21:23:01 +0100
Subject: php71: 7.1.25 -> 7.1.26

Changelog: http://php.net/ChangeLog-7.php#7.1.26
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/interpreters')

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 7040e5883942..3d9235757c6e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -245,8 +245,8 @@ let
 
 in {
   php71 = generic {
-    version = "7.1.25";
-    sha256 = "1b5az5vhap593ggjxirs1zdlg20hcv9h94iq5kgaxky71a4dqb00";
+    version = "7.1.26";
+    sha256 = "1riaaizyl0jv9p6b8sm8xxj8iqz4p4dddwdag03n1r67dfl1qdav";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
-- 
cgit 1.4.1