Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: db561c90ef34
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 92e700d29718
Choose a head ref
  • 6 commits
  • 4 files changed
  • 3 contributors

Commits on Nov 27, 2018

  1. php71: 7.1.22 -> 7.1.23 

    Changelog: https://secure.php.net/ChangeLog-7.php#7.1.23
(cherry picked from commit 36e3fdd)
    @etu @delroth
    etu authored and delroth committed Nov 27, 2018
    Copy the full SHA
    96d56c8 View commit details
    Browse the repository at this point in the history

  2. php72: 7.2.10 -> 7.2.11 

    Changelog: https://secure.php.net/ChangeLog-7.php#7.2.11
(cherry picked from commit b9773bd)
    @etu @delroth
    etu authored and delroth committed Nov 27, 2018
    Copy the full SHA
    a294c12 View commit details
    Browse the repository at this point in the history

  3. php: align Darwin and Linux versions again 

    Instead of pinning Darwin to older versions, add small patches to
configure.in (7.1) / configure.ac (7.2) to fix the build of the intl
extension on recent PHP versions on Darwin.

fix-paths-php7.patch also required changes -- since we now run autoconf
at build time (through ./buildconf), it needs to patch the input .m4
files instead of ./configure directly.

(cherry picked from commit ea10173)
    @delroth
    delroth committed Nov 27, 2018
    Copy the full SHA
    df57073 View commit details
    Browse the repository at this point in the history

  4. php71: 7.1.23 -> 7.1.24 

    (cherry picked from commit 8221da3)
    @delroth
    delroth committed Nov 27, 2018
    Copy the full SHA
    574e5af View commit details
    Browse the repository at this point in the history

  5. php72: 7.2.11 -> 7.2.12 

    (cherry picked from commit ec3d829)
    @delroth
    delroth committed Nov 27, 2018
    Copy the full SHA
    a281d8d View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2018

  1. Merge branch 'pr-51092' into release-18.09 

    * pr-51092:
  php72: 7.2.11 -> 7.2.12
  php71: 7.1.23 -> 7.1.24
  php: align Darwin and Linux versions again
  php72: 7.2.10 -> 7.2.11
  php71: 7.1.22 -> 7.1.23
    @Ekleog
    Ekleog committed Nov 28, 2018
    Copy the full SHA
    92e700d View commit details
    Browse the repository at this point in the history