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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4180533bbfae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a6b361d6276b
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 16, 2020

  1. wrapProgram for phpdbg in pkgs.php*

    Alex Good committed Nov 16, 2020
    Copy the full SHA
    68761cb View commit details

  2. Merge branch 'master' into wrapprogram-for-phpdbg

    Alex Good committed Nov 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aaa7af1 View commit details

  3. Merge pull request #103976 from alexjg/wrapprogram-for-phpdbg 

    wrapProgram for phpdbg in pkgs.php*
    @etu
    etu authored Nov 16, 2020
    Copy the full SHA
    a6b361d View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/development/interpreters/php/generic.nix
4 changes: 4 additions & 0 deletions pkgs/development/interpreters/php/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -126,6 +126,10 @@ let
if test -e $out/bin/php-fpm; then
wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
fi
if test -e $out/bin/phpdbg; then
wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib
fi
'';
};
in