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

Update php packages #65846

Merged
merged 9 commits into from Aug 10, 2019

Conversation

@Izorkin
Copy link
Contributor

commented Aug 3, 2019

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 @

version = "3.1.5";
pthreads = if isPhp73 then pthreads32-dev else pthreads32;

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

This comment has been minimized.

Copy link
@Izorkin

Izorkin Aug 3, 2019

Author Contributor

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

This comment has been minimized.

Copy link
@etu

etu Aug 3, 2019

Contributor

What is the resulting behavior that you need?

This comment has been minimized.

Copy link
@Izorkin

Izorkin Aug 4, 2019

Author Contributor

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

This comment has been minimized.

Copy link
@etu

etu Aug 4, 2019

Contributor

But not if it's not php73 I assume?

This comment has been minimized.

Copy link
@Izorkin

Izorkin Aug 4, 2019

Author Contributor

yes

This comment has been minimized.

Copy link
@Izorkin

Izorkin Aug 4, 2019

Author Contributor

to php 7.3 need pthreads 3.2.0-dev

@Izorkin

This comment has been minimized.

Copy link
Contributor Author

commented Aug 3, 2019

cc @etu

@etu
etu approved these changes Aug 3, 2019
Copy link
Contributor

left a comment

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

This comment has been minimized.

Copy link
Contributor

commented Aug 3, 2019

The php upgrades should also be backported to 19.03

@aanderse

This comment has been minimized.

Copy link
Contributor

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
Copy link
Member

left a comment

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

15 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
php72, php73, phpPackages.ast, phpPackages.composer, phpPackages.event, phpPackages.protobuf, phpPackages.redis on aarch64-linux Success
Details
php72, php73, phpPackages.ast, phpPackages.composer, phpPackages.event, phpPackages.protobuf, phpPackages.redis on x86_64-linux Success
Details
vcunat added a commit that referenced this pull request Aug 10, 2019
vcunat added a commit that referenced this pull request Aug 10, 2019
php72: 7.2.20 -> 7.2.21 (PR #65846)
(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 added a commit that referenced this pull request Aug 10, 2019
php73: 7.3.7 -> 7.3.8 (PR #65846)
(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

This comment has been minimized.

Copy link
Member

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 Izorkin:php-packages branch Aug 10, 2019

rycee added a commit to rycee/nixpkgs that referenced this pull request Aug 31, 2019
php72: 7.2.20 -> 7.2.21 (PR NixOS#65846)
(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
rycee added a commit to rycee/nixpkgs that referenced this pull request Aug 31, 2019
php73: 7.3.7 -> 7.3.8 (PR NixOS#65846)
(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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.