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

Commits on Dec 10, 2017

  1. Revert "fix phpPackages memcache,memcached,xdebug" 

    This reverts commit 8c125c0.
    @andir
    andir committed Dec 10, 2017
    Copy the full SHA
    7d7d377 View commit details
    Browse the repository at this point in the history

  2. uwimap: Do not pollute include/ with headers 

    uwimap was shipping an `include/unix.h` file that would be falsely
detected by many applications (e.g. php and its modules). Due to that
file we got hacks like 8c125c0.

This also adds some previously missing files that would normally be
installed by uwimap (linkage.c, osdep/unix/*.h, …)
    @andir
    andir committed Dec 10, 2017
    Copy the full SHA
    939e71f View commit details
    Browse the repository at this point in the history

  3. prayer: use correct include directory for c-client aka uwimap

    @andir
    andir committed Dec 10, 2017
    Copy the full SHA
    1217ffe View commit details
    Browse the repository at this point in the history

  4. uwsgi: do not touch unix.h anymore

    @andir
    andir committed Dec 10, 2017
    Copy the full SHA
    92158e8 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2017

  1. Merge pull request #32302 from andir/uwimap-pollution 

    uwimap pollution of `include/`
    @Mic92
    Mic92 committed Dec 28, 2017
    Copy the full SHA
    c333e9b View commit details
    Browse the repository at this point in the history