diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-04 17:02:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 17:02:45 +0100 |
commit | a4581f521dac24e44e83def0335457e3caba7e04 (patch) | |
tree | c25911eddb00d61532f3c99009ef4c4e8a3d27ea | |
parent | b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda (diff) | |
parent | f56b733e3186eccdbc85ffd3b067d5a076998fb4 (diff) | |
download | nixpkgs-a4581f521dac24e44e83def0335457e3caba7e04.tar nixpkgs-a4581f521dac24e44e83def0335457e3caba7e04.tar.gz nixpkgs-a4581f521dac24e44e83def0335457e3caba7e04.tar.bz2 nixpkgs-a4581f521dac24e44e83def0335457e3caba7e04.tar.lz nixpkgs-a4581f521dac24e44e83def0335457e3caba7e04.tar.xz nixpkgs-a4581f521dac24e44e83def0335457e3caba7e04.tar.zst nixpkgs-a4581f521dac24e44e83def0335457e3caba7e04.zip |
Merge pull request #38427 from mkaito/update-factorio
factorio: 0.16.24 -> 0.16.36
-rw-r--r-- | pkgs/games/factorio/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index b3319bae973..2cc63e9ecde 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -19,15 +19,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; }; - experimental = bdist { sha256 = "0s7cn5xhzwn793bmvlhlmibhbxdpfmpnpn33k5a4hdprc5gc27rg"; version = "0.16.24"; fetcher = authenticatedFetch; }; + stable = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; }; + experimental = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; }; }; headless = { - stable = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; }; - experimental = bdist { sha256 = "1ff4yjybiqr5kw583hmxkbrbxa3haj4bkjj8sx811c3s269gspi2"; version = "0.16.24"; }; + stable = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; }; + experimental = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; }; }; demo = { - stable = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; }; + stable = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; }; experimental = bdist { }; }; }; @@ -49,7 +49,7 @@ let actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.15.40" + , version ? "0.16.36" , fetcher ? fetchurl , nameMut ? x: x }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 594914782c4..e4de5a8b058 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -612,7 +612,7 @@ with pkgs; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; cconv = callPackage ../tools/text/cconv { }; - + chkcrontab = callPackage ../tools/admin/chkcrontab { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -18926,6 +18926,8 @@ with pkgs; factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-headless-experimental = callPackage ../games/factorio { releaseType = "headless"; experimental = true; }; + factorio-demo = callPackage ../games/factorio { releaseType = "demo"; }; factorio-mods = callPackage ../games/factorio/mods.nix { }; |