diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-25 23:12:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-25 23:12:42 +0200 |
commit | 17f999d66ec0ecd78e814129cc489cb89b77553f (patch) | |
tree | 9aaf54ab01fccdb355e23af2a065e55b8f051cc7 /pkgs | |
parent | 0dd1cdcbb6ca24c4a26f955d910351ffdbc88a48 (diff) | |
parent | 81122d3beb1934ebd83491ff204f2fca9cb25d39 (diff) | |
download | nixlib-17f999d66ec0ecd78e814129cc489cb89b77553f.tar nixlib-17f999d66ec0ecd78e814129cc489cb89b77553f.tar.gz nixlib-17f999d66ec0ecd78e814129cc489cb89b77553f.tar.bz2 nixlib-17f999d66ec0ecd78e814129cc489cb89b77553f.tar.lz nixlib-17f999d66ec0ecd78e814129cc489cb89b77553f.tar.xz nixlib-17f999d66ec0ecd78e814129cc489cb89b77553f.tar.zst nixlib-17f999d66ec0ecd78e814129cc489cb89b77553f.zip |
Merge pull request #25195 from elitak/factorio-version
factorio: 0.14.21 -> 0.15.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/factorio/default.nix | 10 | ||||
-rw-r--r-- | pkgs/games/factorio/fetch.nix | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index e071edfeb815..4a10015bea8a 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -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."; }; }; diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix index 04b31ac10d35..439f2478a667 100644 --- a/pkgs/games/factorio/fetch.nix +++ b/pkgs/games/factorio/fetch.nix @@ -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; |