diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-08 21:40:31 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-16 00:21:02 +0200 |
| commit | 2053ddac783c931053676ebc2b02bc8b82d89399 (patch) | |
| tree | 2f5a9533bc41a482533993f00c9fd3ca4d2b108b /overlays | |
| parent | 69e6151c0c324f920eccb34568ed7ff523592589 (diff) | |
| download | Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.gz Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.zst Nix-2053ddac783c931053676ebc2b02bc8b82d89399.zip | |
Upgrade nixos-unstable
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/nixops/default.nix | 1 | ||||
| -rw-r--r-- | overlays/php-packages/mysqli_patch.patch | 4 |
2 files changed, 3 insertions, 2 deletions
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: { | |||
| 14 | 14 | ||
| 15 | sed -i -e '/^import sys$/s/$/; sys.tracebacklimit = 0/' scripts/nixops | 15 | sed -i -e '/^import sys$/s/$/; sys.tracebacklimit = 0/' scripts/nixops |
| 16 | sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py | 16 | sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py |
| 17 | sed -i -e "/security.initialRootPassword/d" nix/hetzner.nix | ||
| 17 | ''; | 18 | ''; |
| 18 | }); | 19 | }); |
| 19 | } | 20 | } |
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 @@ | |||
| 1 | --- a/mysqli_nonapi.c | 1 | --- a/ext/mysqli/mysqli_nonapi.c |
| 2 | +++ b/mysqli_nonapi.c | 2 | +++ b/ext/mysqli/mysqli_nonapi.c |
| 3 | @@ -263,7 +263,7 @@ void mysqli_common_connect(INTERNAL_FUNC | 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)); | 4 | php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); |
| 5 | 5 | ||