Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update php packages #65846

Merged
merged 9 commits into from Aug 10, 2019
Merged

Update php packages #65846

merged 9 commits into from Aug 10, 2019

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented Aug 3, 2019 •
edited

Motivation for this change

Update php packages:

  • php 7.2.21
  • php 7.3.8
  • composer 1.9.0
  • event 2.5.3
  • ast 1.0.3
  • protobuf 3.9.0
  • pthreads 3.2.0
  • redis 5.0.2
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Izorkin
Izorkin commented Aug 3, 2019
View reviewed changes
pkgs/top-level/php-packages.nix
version = "3.1.5";
pthreads = if isPhp73 then pthreads32-dev else pthreads32;

pthreads32 = assert (pkgs.config.php.zts or false); assert !isPhp73; buildPecl rec {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

assert (pkgs.config.php.zts or false);
I don’t know how to make it work correctly

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the resulting behavior that you need?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If enable ztsSupport (config.php.zts or true) need build pthreads. If (pkgs.config.php.zts or false) - disable build

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But not if it's not php73 I assume?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to php 7.3 need pthreads 3.2.0-dev

@Izorkin
Copy link
Contributor Author

Izorkin commented Aug 3, 2019

cc @etu

etu
etu approved these changes Aug 3, 2019
View reviewed changes
Copy link
Contributor

@etu etu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've have ran through the whole nix-review. Everything did build on my system, except for the oci8 packages. But those failed due to missing source archives. And I'm not willing to get those because it requires an oracle account.

@etu
Copy link
Contributor

etu commented Aug 3, 2019

The php upgrades should also be backported to 19.03

@aanderse
Copy link
Member

aanderse commented Aug 8, 2019

oci8 builds against php72 and php73. Don't hesitate to ping me if you ever need the oci8 packages built for testing.

vcunat
vcunat approved these changes Aug 10, 2019
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost only patch updates, a couple positive reviews, and it's been a week already.

@vcunat vcunat merged commit 22d1795 into NixOS:master Aug 10, 2019
vcunat added a commit that referenced this pull request Aug 10, 2019
@vcunat
Merge #65846: Update php packages
387e695
vcunat pushed a commit that referenced this pull request Aug 10, 2019
@Izorkin @vcunat
php72: 7.2.20 -> 7.2.21 (PR #65846)
d122363 
(cherry picked from commit 7819d3f)
This is a security release which also contains several bug fixes.
http://www.php.net/ChangeLog-7.php#7.2.21
vcunat pushed a commit that referenced this pull request Aug 10, 2019
@Izorkin @vcunat
php73: 7.3.7 -> 7.3.8 (PR #65846)
7e28652 
(cherry picked from commit cb9846c)
This is a security release which also contains several bug fixes.
http://www.php.net/ChangeLog-7.php#7.3.8
@vcunat
Copy link
Member

vcunat commented Aug 10, 2019

I picked the PHP bumps to 19.03, but I haven't looked if anything else needs to.

@Izorkin Izorkin deleted the php-packages branch August 10, 2019 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@etu etu etu approved these changes

@vcunat vcunat vcunat approved these changes

@jtojnar jtojnar Awaiting requested review from jtojnar jtojnar is a code owner

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

@globin globin Awaiting requested review from globin globin is a code owner

Assignees
No one assigned
Labels
1.severity: security 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Izorkin @etu @aanderse @vcunat