diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 01:35:06 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 02:11:48 +0200 |
commit | 1a64deeb894dc95e2645a75771732c6cc53a79ad (patch) | |
tree | 1b9df4838f894577a09b9b260151756272efeb53 /overlays/php-packages | |
parent | fa25ffd4583cc362075cd5e1b4130f33306103f0 (diff) | |
download | Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.gz Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.zst Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.zip |
Squash changes containing private information
There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository
Diffstat (limited to 'overlays/php-packages')
-rw-r--r-- | overlays/php-packages/default.nix | 6 | ||||
-rw-r--r-- | overlays/php-packages/mysqli_patch.patch | 11 |
2 files changed, 0 insertions, 17 deletions
diff --git a/overlays/php-packages/default.nix b/overlays/php-packages/default.nix deleted file mode 100644 index 90fb613..0000000 --- a/overlays/php-packages/default.nix +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | self: super: rec { | ||
2 | myPhpPackages.mysqli_pam = self.php74.extensions.mysqli.overrideAttrs(old: { | ||
3 | configureFlags = [ "--with-mysqli=${self.libmysqlclient_pam}/bin/mysql_config" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; | ||
4 | patches = old.patches or [] ++ [ ./mysqli_patch.patch ]; | ||
5 | }); | ||
6 | } | ||
diff --git a/overlays/php-packages/mysqli_patch.patch b/overlays/php-packages/mysqli_patch.patch deleted file mode 100644 index a8f03e3..0000000 --- a/overlays/php-packages/mysqli_patch.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- a/ext/mysqli/mysqli_nonapi.c | ||
2 | +++ b/ext/mysqli/mysqli_nonapi.c | ||
3 | @@ -263,7 +263,7 @@ void mysqli_common_connect(INTERNAL_FUNC | ||
4 | php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); | ||
5 | |||
6 | #if !defined(MYSQLI_USE_MYSQLND) | ||
7 | - mysql->mysql->reconnect = MyG(reconnect); | ||
8 | + mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (my_bool *)&MyG(reconnect)); | ||
9 | #endif | ||
10 | |||
11 | mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&MyG(allow_local_infile)); | ||