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: d3a41f3c23b5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b231ac2101b1
Choose a head ref
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Apr 17, 2020

  1. nixos/httpd: Use extensions from php package

    After the recent rewrite, enabled extensions are passed to php programs
    through an extra ini file by a wrapper. Since httpd uses shared module
    instead of program, the wrapper did not affect it and no extensions
    other than built-ins were loaded.
    
    To fix this, we are passing the extension config another way – by adding it
    to the service's generated config.
    
    For now we are hardcoding the path to the ini file. It would be nice to add
    the path to the passthru and use that once the PHP expression settles down.
    jtojnar committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    c214e63 View commit details
    Browse the repository at this point in the history
  2. nixosTests.php.httpd: init

    jtojnar committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    aac9832 View commit details
    Browse the repository at this point in the history
  3. nixosTests.php.pcre: Clean up

    And add assertion messages
    jtojnar committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b69556c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    23a6903 View commit details
    Browse the repository at this point in the history
  5. nixos/httpd: remove unnecessary override

    This was introduced in c801cd1
    but it no longer seems necessary.
    jtojnar committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    4816b42 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Configuration menu
    Copy the full SHA
    b231ac2 View commit details
    Browse the repository at this point in the history