Commit graph

160 commits

Author SHA1 Message Date
Marc Scholten d1219ba68f php: Fixed libiconv error 2016-06-13 18:25:58 +02:00
Marc Scholten d4babc49dc php: Now builds on darwin 2016-06-09 14:49:55 +02:00
Eelco Dolstra 109096247a php56: update to 5.6.22
(cherry picked from commit 72b4009367257c2447aac89d5f34f2421bbc88dc)
2016-06-09 10:04:39 +00:00
Vladimír Čunát e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Franz Pletz 93c010ddad php: 5.5.35 -> 5.5.36, 7.0.6 -> 7.0.7 (security)
See:

  * https://secure.php.net/ChangeLog-5.php#5.5.36
  * https://secure.php.net/ChangeLog-7.php#7.0.7
2016-05-26 18:44:31 +02:00
Tuomas Tynkkynen 7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen 8d473f107c treewide: Make explicit that 'dev' output of readline is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen 3672f3edcb treewide: Make explicit that 'dev' output of libxslt is used 2016-05-19 10:00:48 +02:00
Tuomas Tynkkynen 309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Tuomas Tynkkynen 47c45e2041 treewide: Make explicit that 'dev' output of gmp is used 2016-05-19 10:00:36 +02:00
Tuomas Tynkkynen 288912c2c4 treewide: Make explicit that 'dev' output of freetype is used 2016-05-19 10:00:34 +02:00
Tuomas Tynkkynen e28e010b36 treewide: Make explicit that 'dev' output of curl is used 2016-05-19 10:00:29 +02:00
Tuomas Tynkkynen c22f86a853 treewide: Make explicit that 'dev' output of bzip2 is used 2016-05-19 10:00:28 +02:00
Franz Pletz 4d750ae2c7 php: 7.0.5 -> 7.0.6 2016-05-13 17:27:59 +02:00
Joachim Fasting 23fd70b719 Merge pull request #15018 from ericsagnes/pkg-fix/php
php: add default php.ini
2016-05-05 19:16:04 +02:00
Franz Pletz c0f4361902 php: Fix openssl module build 2016-05-03 16:04:40 +02:00
Robert Scott 11a716491b php: 5.5.34 -> 5.4.35 2016-04-30 22:32:34 +00:00
Robert Scott e9c16b7902 php: 5.6.20 -> 5.6.21 2016-04-30 20:48:12 +00:00
Eric Sagnes a8bc5b67f8 php: add default php.ini 2016-04-29 15:26:20 +09:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Robert Scott d61b739f07 php: 5.6.19 -> 5.6.20 2016-04-10 18:41:57 +00:00
Robert Scott 1773c53fcf php55: 5.5.33 -> 5.5.34 2016-04-10 14:45:35 +00:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Franz Pletz fc1e886f1b php: 7.0.2 -> 7.0.5 (security)
https://secure.php.net/ChangeLog-7.php#7.0.5
2016-03-31 16:07:43 +02:00
Robert Scott 9f54f755a9 php: 5.5.32 -> 5.5.33 (security update) 2016-03-19 11:18:12 +00:00
Robert Scott e4817b7d99 php: 5.6.18 -> 5.6.19 (security update) 2016-03-19 11:15:48 +00:00
Vladimír Čunát c801cd1a04 php: fixup build when configured with httpd via nixos 2016-03-11 11:54:53 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Eelco Dolstra fc84ee22df php: Remove version 5.4 which is EOL 2016-02-11 11:27:34 +01:00
Eelco Dolstra 42634fe6cc php: 5.5.31 -> 5.5.32 2016-02-11 11:24:54 +01:00
Eelco Dolstra b061225c54 php: 5.6.17 -> 5.6.18 2016-02-11 11:24:48 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Arseniy Seroka 3443462ab1 Merge pull request #12233 from deeky666/php-7.0.2
php: 7.0.1 -> 7.0.2
2016-01-08 20:22:00 +03:00
Eelco Dolstra aa73be3609 Merge pull request #12232 from deeky666/php-5.5.31
php: 5.5.30 -> 5.5.31
2016-01-08 12:36:09 +01:00
Steve Müller 4341df2f70 php: 7.0.1 -> 7.0.2 2016-01-08 10:51:35 +01:00
Steve Müller 5250326474 php: 5.5.30 -> 5.5.31 2016-01-08 10:49:04 +01:00
Steve Müller 7c54bca127 php: 5.6.16 -> 5.6.17 2016-01-08 10:42:32 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Steve Müller cf99e57c80 php: 7.0.0 -> 7.0.1 2015-12-18 09:41:51 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Steve Müller de327c7db7 fixes #11618: make php and phpPackages extension directory consistent 2015-12-11 01:24:05 +01:00
Robin Gloster f22b401cdc php70: 7.0.0RC6 -> 7.0.0 2015-12-02 12:54:04 +00:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Robin Gloster ef4f3e6ff4 php56: 5.6.15 -> 5.6.16 2015-11-28 16:54:20 +00:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Robin Gloster fdf8e4f2c8 php70: 7.0.0beta1 -> 7.0.0RC6 2015-11-01 12:13:16 +00:00
Robin Gloster 0ceec8420c php: 5.6.14 -> 5.6.15 2015-11-01 12:12:13 +00:00