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: ffbe3a4218d3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9d080ac155b5
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 27, 2018

  1. 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.
    @delroth
    delroth committed Nov 27, 2018
    Copy the full SHA
    ea10173 View commit details
    Browse the repository at this point in the history

  2. php71: 7.1.23 -> 7.1.24

    @delroth
    delroth committed Nov 27, 2018
    Copy the full SHA
    8221da3 View commit details
    Browse the repository at this point in the history

  3. php72: 7.2.11 -> 7.2.12

    @delroth
    delroth committed Nov 27, 2018
    Copy the full SHA
    ec3d829 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'pr-51091' 

    * pr-51091:
  php72: 7.2.11 -> 7.2.12
  php71: 7.1.23 -> 7.1.24
  php: align Darwin and Linux versions again
    @Ekleog
    Ekleog committed Nov 27, 2018
    Copy the full SHA
    9d080ac View commit details
    Browse the repository at this point in the history