diff options
| author | Elis Hirwing <elis@hirwing.se> | 2019-01-10 21:22:04 +0100 |
|---|---|---|
| committer | Elis Hirwing <elis@hirwing.se> | 2019-01-10 21:22:54 +0100 |
| commit | ab341a18ad6cf6bf9c90966151da2eb6e234061f (patch) | |
| tree | c57a364bdbca5b338af494b6569bb9346e63772a /pkgs/development/interpreters | |
| parent | fc7bbfdc40c98e6921afc106592d2fea3aafe2ce (diff) | |
| download | nixlib-ab341a18ad6cf6bf9c90966151da2eb6e234061f.tar nixlib-ab341a18ad6cf6bf9c90966151da2eb6e234061f.tar.gz nixlib-ab341a18ad6cf6bf9c90966151da2eb6e234061f.tar.bz2 nixlib-ab341a18ad6cf6bf9c90966151da2eb6e234061f.tar.lz nixlib-ab341a18ad6cf6bf9c90966151da2eb6e234061f.tar.xz nixlib-ab341a18ad6cf6bf9c90966151da2eb6e234061f.tar.zst nixlib-ab341a18ad6cf6bf9c90966151da2eb6e234061f.zip | |
php72: 7.2.13 -> 7.2.14
Changelog: http://php.net/ChangeLog-7.php#7.2.14
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/fix-bug-71041.patch | 25 |
2 files changed, 3 insertions, 30 deletions
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); |