Merge pull request #25195 from elitak/factorio-version

factorio: 0.14.21 -> 0.15.1
This commit is contained in:
Jörg Thalheim 2017-04-25 23:12:42 +02:00 committed by GitHub
commit 17f999d66e
2 changed files with 8 additions and 8 deletions

View file

@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless";
with stdenv.lib;
let
version = "0.14.21";
version = "0.15.1";
isHeadless = releaseType == "headless";
arch = if stdenv.system == "x86_64-linux" then {
@ -25,14 +25,14 @@ let
fetch = rec {
url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz";
name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
x64 = {
headless = fetchurl { inherit name url; sha256 = "0bx4fq46781vv9vr0ciyckaskksjrqikvcdv1yz0wj8mrb2j08cw"; };
alpha = authenticatedFetch { inherit url; sha256 = "067p1i5wcxk88kmblyklc4lh8fqjc5pqjdarvhjz420vqmdls7k6"; };
headless = fetchurl { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; };
alpha = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; };
};
i386 = {
headless = abort "Factorio 32-bit headless binaries are not available for download.";
alpha = authenticatedFetch { inherit url; sha256 = "0iwhachp0z02w19x5y70qy3b0yp79dspawkcygdfna5cfqrybvx6"; };
alpha = abort "Factorio 32-bit client is not available for this version.";
};
};

View file

@ -8,6 +8,8 @@
# URL to fetch.
url ? ""
, name ? "factorio.tar.gz"
# Login URL.
, loginUrl ? "https://www.factorio.com/login"
@ -16,11 +18,9 @@
}:
stdenv.mkDerivation {
name = "factorio.tar.gz";
buildInputs = [ curl xidel ];
inherit url loginUrl username password cacert;
inherit name url loginUrl username password cacert;
builder = ./fetch.sh;