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: 3bd6c7a6f480
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 55e4ef4f59fb
Choose a head ref
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Dec 29, 2020

  1. uwsgi: set UWSGICONFIG_PHPPATH to the php.dev store 

    uwsgi needs to run php-config to get the include path. set the
UWSGICONFIG_PHPPATH to the php-config in the php.dev store.

Patch common.h to directly include php_session.h (since it's a separate package on
nixos).

NIX_CFLAGS_LINK was removed since it doesn't seem to be used at all

https://github.com/unbit/uwsgi/blob/master/plugins/php/common.h
(cherry picked from commit 6dd858d)
    @gdamjan
    gdamjan committed Dec 29, 2020
    Copy the full SHA
    bd5c6cd View commit details
    Browse the repository at this point in the history

  2. uwsgi: the php plugin needs to link with session.so 

    On NixOS the session.so php extension is a separate package (and not builtin
in libphp.so). But since the uwsgi php plugin uses the session
mechanisms, we need to link the plugin to that library too.

With this change uwsgipluginpy is hacked to take an additional UWSGICONFIG_PHP_LDFLAGS
environment variable and add it to its LDFLAGS, and then in the nix
expression the UWSGICONFIG_PHP_LDFLAGS is set to point to php.extensions.session

(cherry picked from commit 87bed6c)
    @gdamjan
    gdamjan committed Dec 29, 2020
    Copy the full SHA
    c825b61 View commit details
    Browse the repository at this point in the history

  3. nixos/tests/uwsgi: test PHP plugin 

    (cherry picked from commit 06749ba)
    @rnhmjoj @gdamjan
    rnhmjoj authored and gdamjan committed Dec 29, 2020
    Copy the full SHA
    cb95b0e View commit details
    Browse the repository at this point in the history

  4. uwsgi: add passthru.tests.uwsgi to derivation 

    (cherry picked from commit 41af371)
    @gdamjan
    gdamjan committed Dec 29, 2020
    Copy the full SHA
    36d68d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2020

  1. Merge pull request #107792 from gdamjan/fix-uwsgi-php-20.09 

    [20.09] pkgs/uwsgi: fix compiling and linking the php plugin in uwsgi
    @rnhmjoj
    rnhmjoj committed Dec 31, 2020
    Copy the full SHA
    55e4ef4 View commit details
    Browse the repository at this point in the history