diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-15 16:59:03 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-15 16:59:03 +0100 |
| commit | 42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4 (patch) | |
| tree | 787093bb48bb6a2b16f0976ac707641a13893b93 /pkgs/development/interpreters | |
| parent | 1f0467005dd43c3c0f57c87da1c298aed7ea8b46 (diff) | |
| parent | ab8e72b7bb24d73a588d9783240a1d0154a50ff7 (diff) | |
| download | nixpkgs-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar nixpkgs-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.gz nixpkgs-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.bz2 nixpkgs-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.lz nixpkgs-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.xz nixpkgs-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.zst nixpkgs-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/fix-bug-71041.patch | 25 |
2 files changed, 5 insertions, 32 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index d890b1862d3..3d9235757c6 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -245,21 +245,19 @@ 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; }; 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 350b635bdf3..00000000000 --- 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); |