From 2053ddac783c931053676ebc2b02bc8b82d89399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 8 Aug 2020 21:40:31 +0200 Subject: Upgrade nixos-unstable --- overlays/nixops/default.nix | 1 + overlays/php-packages/mysqli_patch.patch | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'overlays') diff --git a/overlays/nixops/default.nix b/overlays/nixops/default.nix index a297685..14aec3b 100644 --- a/overlays/nixops/default.nix +++ b/overlays/nixops/default.nix @@ -14,6 +14,7 @@ self: super: { sed -i -e '/^import sys$/s/$/; sys.tracebacklimit = 0/' scripts/nixops sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py + sed -i -e "/security.initialRootPassword/d" nix/hetzner.nix ''; }); } diff --git a/overlays/php-packages/mysqli_patch.patch b/overlays/php-packages/mysqli_patch.patch index 0ec3a3b..a8f03e3 100644 --- a/overlays/php-packages/mysqli_patch.patch +++ b/overlays/php-packages/mysqli_patch.patch @@ -1,5 +1,5 @@ ---- a/mysqli_nonapi.c -+++ b/mysqli_nonapi.c +--- a/ext/mysqli/mysqli_nonapi.c ++++ b/ext/mysqli/mysqli_nonapi.c @@ -263,7 +263,7 @@ void mysqli_common_connect(INTERNAL_FUNC php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); -- cgit v1.2.3