diff options
author | joachifm <joachifm@users.noreply.github.com> | 2016-07-12 15:51:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-12 15:51:43 +0200 |
commit | c07866a641d10a6dc527e0d8a59f4f531145a51f (patch) | |
tree | 74668f4d892c23cea651ac595f7538db122d7507 | |
parent | 416120e0c74351d61c1b0d508581a1ddbaeb7de9 (diff) | |
parent | 2b47d24007c649414e59c884fe6d999a2b3990d1 (diff) | |
download | nixlib-c07866a641d10a6dc527e0d8a59f4f531145a51f.tar nixlib-c07866a641d10a6dc527e0d8a59f4f531145a51f.tar.gz nixlib-c07866a641d10a6dc527e0d8a59f4f531145a51f.tar.bz2 nixlib-c07866a641d10a6dc527e0d8a59f4f531145a51f.tar.lz nixlib-c07866a641d10a6dc527e0d8a59f4f531145a51f.tar.xz nixlib-c07866a641d10a6dc527e0d8a59f4f531145a51f.tar.zst nixlib-c07866a641d10a6dc527e0d8a59f4f531145a51f.zip |
Merge pull request #16882 from elitak/factorio013
factorio: 0.12.35 -> 0.13.8
-rw-r--r-- | nixos/modules/services/games/factorio.nix | 4 | ||||
-rw-r--r-- | pkgs/games/factorio/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 10f3daea69e4..90834c5b2605 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -78,7 +78,7 @@ in test -e ${stateDir}/saves/${cfg.saveName}.zip || \ ${pkgs.factorio-headless}/bin/factorio \ --config=${cfg.configFile} \ - --create=${cfg.saveName} + --create=${stateDir}/saves/${cfg.saveName}.zip ''; serviceConfig = { @@ -93,7 +93,7 @@ in "${pkgs.factorio-headless}/bin/factorio" "--config=${cfg.configFile}" "--port=${toString cfg.port}" - "--start-server=${cfg.saveName}" + "--start-server=${stateDir}/saves/${cfg.saveName}.zip" ]; }; }; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 1447fed2a82e..cb04e9c47501 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -8,7 +8,7 @@ assert releaseType == "alpha" || releaseType == "headless"; with stdenv.lib; let - version = "0.12.35"; + version = "0.13.8"; isHeadless = releaseType == "headless"; arch = if stdenv.system == "x86_64-linux" then { @@ -25,12 +25,12 @@ let url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; # TODO take this from 302 redirection somehow? fetchurl doesn't help. x64 = { - headless = fetchurl { inherit name url; sha256 = "1pdfd6qpzdzxsz1pvf1qasw5p6mzidi2q5d5m8x0gqyxaqdg175b"; }; - alpha = authenticatedFetch { inherit url; sha256 = "1r2q5hvx8248vfl7jg9jr0sk9kxhh5lg4qlv828j44dmgsxyhn1y"; }; + headless = fetchurl { inherit name url; sha256 = "0dliympqnnawfw65n5gnda9mljyqwshmq2hvplf1h8nrp1rw3pgj"; }; + alpha = authenticatedFetch { inherit url; sha256 = "12safa8b4g5cpwxbkf8ldkb17lgf33rslr7p81l7gr1lyzfnf82c"; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; - alpha = authenticatedFetch { inherit url; sha256 = "1f3hl6m59zvmjrph0kj7fh1axdahgan1v5v3y4rdc6idamvr7rrf"; }; + alpha = authenticatedFetch { inherit url; sha256 = "0m4m183avnqxkw28vb7za14dsmcd01sdldgga0br1clilxmgph2w"; }; }; }; |