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

Commits on Apr 11, 2020

  1. php.extensions.pdo_mysql: Set default socket location 

    Set the default socket location to match the one used by the MySQL
module, so PHP programs using pdo_mysql don't have to specify this
themselves.
    @talyz
    talyz committed Apr 11, 2020
    Copy the full SHA
    d85bf2f View commit details

  2. Merge pull request #84993 from talyz/pdo_mysql_socket 

    php.extensions.pdo_mysql: Set default socket location
    @etu
    etu authored Apr 11, 2020
    Copy the full SHA
    61ab265 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/top-level/php-packages.nix
2 changes: 1 addition & 1 deletion pkgs/top-level/php-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -939,7 +939,7 @@ in
# pdo_firebird (7.4, 7.3, 7.2)
{ name = "pdo_mysql";
internalDeps = with php.extensions; [ pdo mysqlnd ];
configureFlags = [ "--with-pdo-mysql=mysqlnd" ];
configureFlags = [ "--with-pdo-mysql=mysqlnd" "PHP_MYSQL_SOCK=/run/mysqld/mysqld.sock" ];
doCheck = false; }
# pdo_oci (7.4, 7.3, 7.2)
{ name = "pdo_odbc";