ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

factorio: 0.12.35 -> 0.13.8

Browse Source
This commit is contained in:
Eric Litak 2016-07-12 02:21:00 -07:00
parent b5a95b1812
commit 2b47d24007
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/games/factorio.nix
View File

@ -78,7 +78,7 @@ in
test -e ${stateDir}/saves/${cfg.saveName}.zip || \ test -e ${stateDir}/saves/${cfg.saveName}.zip || \
${pkgs.factorio-headless}/bin/factorio \ ${pkgs.factorio-headless}/bin/factorio \
--config=${cfg.configFile} \ --config=${cfg.configFile} \
--create=${cfg.saveName} --create=${stateDir}/saves/${cfg.saveName}.zip
''; '';
serviceConfig = { serviceConfig = {
@ -93,7 +93,7 @@ in
"${pkgs.factorio-headless}/bin/factorio" "${pkgs.factorio-headless}/bin/factorio"
"--config=${cfg.configFile}" "--config=${cfg.configFile}"
"--port=${toString cfg.port}" "--port=${toString cfg.port}"
"--start-server=${cfg.saveName}" "--start-server=${stateDir}/saves/${cfg.saveName}.zip"
]; ];
}; };
}; };

8
pkgs/games/factorio/default.nix
View File

@ -8,7 +8,7 @@ assert releaseType == "alpha" || releaseType == "headless";
with stdenv.lib; with stdenv.lib;
let let
version = "0.12.35"; version = "0.13.8";
isHeadless = releaseType == "headless"; isHeadless = releaseType == "headless";
arch = if stdenv.system == "x86_64-linux" then { arch = if stdenv.system == "x86_64-linux" then {
@ -25,12 +25,12 @@ let
url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; 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. name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; # TODO take this from 302 redirection somehow? fetchurl doesn't help.
x64 = { x64 = {
headless = fetchurl { inherit name url; sha256 = "1pdfd6qpzdzxsz1pvf1qasw5p6mzidi2q5d5m8x0gqyxaqdg175b"; }; headless = fetchurl { inherit name url; sha256 = "0dliympqnnawfw65n5gnda9mljyqwshmq2hvplf1h8nrp1rw3pgj"; };
alpha = authenticatedFetch { inherit url; sha256 = "1r2q5hvx8248vfl7jg9jr0sk9kxhh5lg4qlv828j44dmgsxyhn1y"; }; alpha = authenticatedFetch { inherit url; sha256 = "12safa8b4g5cpwxbkf8ldkb17lgf33rslr7p81l7gr1lyzfnf82c"; };
}; };
i386 = { i386 = {
headless = abort "Factorio 32-bit headless binaries are not available for download."; headless = abort "Factorio 32-bit headless binaries are not available for download.";
alpha = authenticatedFetch { inherit url; sha256 = "1f3hl6m59zvmjrph0kj7fh1axdahgan1v5v3y4rdc6idamvr7rrf"; }; alpha = authenticatedFetch { inherit url; sha256 = "0m4m183avnqxkw28vb7za14dsmcd01sdldgga0br1clilxmgph2w"; };
}; };
}; };