From f5dbac318de88043188e0351b1d63af5f8b5167c Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Wed, 8 Apr 2020 11:35:40 +0000 Subject: [PATCH] nixops: fix format exception from upstream nixops Without this our nixops doesn't build --- pkgs/nixops/release.nix.patch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/nixops/release.nix.patch b/pkgs/nixops/release.nix.patch index 734159b..940073e 100644 --- a/pkgs/nixops/release.nix.patch +++ b/pkgs/nixops/release.nix.patch @@ -43,7 +43,6 @@ ('destDir', 'string'), ('user', 'string'), ('group', 'string'), - --- a/nixops/ssh_util.py +++ b/nixops/ssh_util.py @@ -278,6 +278,7 @@ class SSH(object): @@ -54,3 +53,15 @@ master = self.get_master(flags, timeout, user) flags = flags + self._get_flags() if logged: + +--- a/nixops/deployment.py ++++ b/nixops/deployment.py +@@ -748,6 +748,6 @@ + if res == 100 or force_reboot or m.state == m.RESCUE: + if not allow_reboot and not force_reboot: + raise Exception("the new configuration requires a " +- "reboot to take effect (hint: use " ++ "reboot of '{}' to take effect (hint: use " + "‘--allow-reboot’)".format(m.name)) + m.reboot_sync() + res = 0 \ No newline at end of file