From fcdb8bfaf11843d6ea75bc7010d037f85630d096 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Mar 2021 10:34:18 -0800 Subject: [PATCH 1/2] factorio: 1.1.26 -> 1.1.27 --- pkgs/games/factorio/versions.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index b38069355ee..1f8b2010226 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.27" }, "stable": { - "name": "factorio_alpha_x64-1.1.26.tar.xz", + "name": "factorio_alpha_x64-1.1.27.tar.xz", "needsAuth": true, - "sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2", + "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/alpha/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/alpha/linux64", + "version": "1.1.27" } }, "demo": { @@ -28,12 +28,12 @@ "version": "1.1.27" }, "stable": { - "name": "factorio_demo_x64-1.1.26.tar.xz", + "name": "factorio_demo_x64-1.1.27.tar.xz", "needsAuth": false, - "sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x", + "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/demo/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/demo/linux64", + "version": "1.1.27" } }, "headless": { @@ -46,12 +46,12 @@ "version": "1.1.27" }, "stable": { - "name": "factorio_headless_x64-1.1.26.tar.xz", + "name": "factorio_headless_x64-1.1.27.tar.xz", "needsAuth": false, - "sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj", + "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/headless/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/headless/linux64", + "version": "1.1.27" } } } From d980362a95d5f2ac3af8122d521e445271a8afb6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Mar 2021 10:34:59 -0800 Subject: [PATCH 2/2] nixos/factorio: add nonBlockingSaving option --- nixos/modules/services/games/factorio.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 73099ae3363..a1aa5739d06 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -36,6 +36,7 @@ let only_admins_can_pause_the_game = true; autosave_only_on_server = true; admins = []; + non_blocking_saving = cfg.nonBlockingSaving; } // cfg.extraSettings; serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings)); modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods; @@ -193,6 +194,15 @@ in Autosave interval in minutes. ''; }; + nonBlockingSaving = mkOption { + type = types.bool; + default = false; + description = '' + Highly experimental feature, enable only at your own risk of losing your saves. + On UNIX systems, server will fork itself to create an autosave. + Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option. + ''; + }; }; };