Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | treewide: Make explicit that 'dev' output of curl is used | Tuomas Tynkkynen | 2016-05-19 | |
| | | | ||||
| | * | treewide: Make explicit that 'dev' output of bzip2 is used | Tuomas Tynkkynen | 2016-05-19 | |
| | | | ||||
| * | | php: 5.5.35 -> 5.5.36, 7.0.6 -> 7.0.7 (security) | Franz Pletz | 2016-05-26 | |
| |/ | | | | | | | | | | | | | See: * https://secure.php.net/ChangeLog-5.php#5.5.36 * https://secure.php.net/ChangeLog-7.php#7.0.7 | |||
* | | Merge remote-tracking branch 'origin/master' into hardened-stdenv | Franz Pletz | 2016-05-18 | |
|\| | ||||
| * | php: 7.0.5 -> 7.0.6 | Franz Pletz | 2016-05-13 | |
| | | ||||
| * | Merge pull request #15018 from ericsagnes/pkg-fix/php | Joachim Fasting | 2016-05-05 | |
| |\ | | | | | | | php: add default php.ini | |||
| | * | php: add default php.ini | Eric Sagnes | 2016-04-29 | |
| | | | ||||
| * | | php: Fix openssl module build | Franz Pletz | 2016-05-03 | |
| | | | ||||
* | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-05-02 | |
|\| | | ||||
| * | | php: 5.5.34 -> 5.4.35 | Robert Scott | 2016-04-30 | |
| | | | ||||
| * | | php: 5.6.20 -> 5.6.21 | Robert Scott | 2016-04-30 | |
| |/ | ||||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-04-18 | |
|\| | ||||
| * | Merge branch 'staging', containing closure-size #7701 | Vladimír Čunát | 2016-04-13 | |
| |\ | ||||
| | * | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-04-10 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs | |||
| | * \ | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-04-01 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts. | |||
| | * | | | php: fixup build when configured with httpd via nixos | Vladimír Čunát | 2016-03-11 | |
| | | | | | ||||
| | * | | | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-02-14 | |
| | |\ \ \ | ||||
| | * \ \ \ | Merge branch 'staging' into closure-size | Vladimír Čunát | 2016-01-19 | |
| | |\ \ \ \ | ||||
| | * \ \ \ \ | Merge branch 'master' into closure-size | Vladimír Čunát | 2015-12-31 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later. | |||
| | * \ \ \ \ \ | Merge branch 'master' into closure-size | Luca Bruno | 2015-12-11 | |
| | |\ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into closure-size | Luca Bruno | 2015-11-29 | |
| | |\ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ | Merge staging into closure-size | Vladimír Čunát | 2015-11-20 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||
| | * | | | | | | | | | php: Apply brute force to locate openldap | Tuomas Tynkkynen | 2015-10-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed after the split to multiple outputs :(. But that's what you get for not providing pkg-config files... | |||
| | * | | | | | | | | | libxml2,libxslt: split into multiple outputs | Vladimír Čunát | 2015-10-05 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed all references, hopefully. libxml2Python is slightly hacky now, but it seems to work. | |||
| | * | | | | | | | | | php: Enable SSL via buildInputs | Tuomas Tynkkynen | 2015-10-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old way doesn't seem to work with multiple outputs. TODO: this seems to be a recurring pattern with openssl, maybe the splitting isn't done correctly? | |||
| * | | | | | | | | | | php: 5.6.19 -> 5.6.20 | Robert Scott | 2016-04-10 | |
| | | | | | | | | | | | ||||
| * | | | | | | | | | | php55: 5.5.33 -> 5.5.34 | Robert Scott | 2016-04-10 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||
* | | | | | | | | | | Revert "php: enable PIE hardening" | Robin Gloster | 2016-04-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fb57bfbd4f66943b59ed67499aa8cb0c8f4f9e6f. | |||
* | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-04-03 | |
|\| | | | | | | | | | ||||
| * | | | | | | | | | php: 7.0.2 -> 7.0.5 (security) | Franz Pletz | 2016-03-31 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | https://secure.php.net/ChangeLog-7.php#7.0.5 | |||
* | | | | | | | | | php: Disable bindnow hardening flag | Franz Pletz | 2016-03-31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dynamic linking against i.e. mysql. | |||
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-03-28 | |
|\| | | | | | | | | ||||
| * | | | | | | | | php: 5.5.32 -> 5.5.33 (security update) | Robert Scott | 2016-03-19 | |
| | | | | | | | | | ||||
| * | | | | | | | | php: 5.6.18 -> 5.6.19 (security update) | Robert Scott | 2016-03-19 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||
* / | | | | | | | php: enable PIE hardening | Franz Pletz | 2016-03-06 | |
|/ / / / / / / | ||||
* | | | | | | | php: Remove version 5.4 which is EOL | Eelco Dolstra | 2016-02-11 | |
| | | | | | | | ||||
* | | | | | | | php: 5.5.31 -> 5.5.32 | Eelco Dolstra | 2016-02-11 | |
| | | | | | | | ||||
* | | | | | | | php: 5.6.17 -> 5.6.18 | Eelco Dolstra | 2016-02-11 | |
| |_|_|_|_|/ |/| | | | | | ||||
* | | | | | | Merge pull request #12233 from deeky666/php-7.0.2 | Arseniy Seroka | 2016-01-08 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | php: 7.0.1 -> 7.0.2 | |||
| * | | | | | | php: 7.0.1 -> 7.0.2 | Steve Müller | 2016-01-08 | |
| | |_|_|_|/ | |/| | | | | ||||
* | | | | | | Merge pull request #12232 from deeky666/php-5.5.31 | Eelco Dolstra | 2016-01-08 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | php: 5.5.30 -> 5.5.31 | |||
| * | | | | | | php: 5.5.30 -> 5.5.31 | Steve Müller | 2016-01-08 | |
| |/ / / / / | ||||
* / / / / / | php: 5.6.16 -> 5.6.17 | Steve Müller | 2016-01-08 | |
|/ / / / / | ||||
* | | | / | php: 7.0.0 -> 7.0.1 | Steve Müller | 2015-12-18 | |
| |_|_|/ |/| | | | ||||
* | | | | fixes #11618: make php and phpPackages extension directory consistent | Steve Müller | 2015-12-11 | |
| | | | | ||||
* | | | | php70: 7.0.0RC6 -> 7.0.0 | Robin Gloster | 2015-12-02 | |
| |_|/ |/| | | ||||
* | | | php56: 5.6.15 -> 5.6.16 | Robin Gloster | 2015-11-28 | |
| |/ |/| | ||||
* | | php70: 7.0.0beta1 -> 7.0.0RC6 | Robin Gloster | 2015-11-01 | |
| | | ||||
* | | php: 5.6.14 -> 5.6.15 | Robin Gloster | 2015-11-01 | |
| | | ||||
* | | php: Update to 5.5.30, 5.6.14 | Eelco Dolstra | 2015-10-07 | |
|/ |