diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index d5190aa1d945..d342f76a2d9c 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -29,7 +29,8 @@ assert releaseType == "alpha" || releaseType == "headless" - || releaseType == "demo"; + || releaseType == "demo" + || releaseType == "expansion"; let @@ -272,6 +273,7 @@ let cp -a doc-html $out/share/factorio ''; }; + expansion = alpha; }; in diff --git a/pkgs/games/factorio/update.py b/pkgs/games/factorio/update.py index c234b36264e8..6da1d9dfee7d 100755 --- a/pkgs/games/factorio/update.py +++ b/pkgs/games/factorio/update.py @@ -55,6 +55,7 @@ SYSTEMS = [ RELEASE_TYPES = [ ReleaseType("alpha", needs_auth=True), + ReleaseType("expansion", needs_auth=True), ReleaseType("demo"), ReleaseType("headless"), ] diff --git a/pkgs/games/factorio/versions-1.json b/pkgs/games/factorio/versions-1.json new file mode 100644 index 000000000000..60e88c026f9d --- /dev/null +++ b/pkgs/games/factorio/versions-1.json @@ -0,0 +1,58 @@ +{ + "x86_64-linux": { + "alpha": { + "experimental": { + "name": "factorio_alpha_x64-1.1.110.tar.xz", + "needsAuth": true, + "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", + "version": "1.1.110" + }, + "stable": { + "name": "factorio_alpha_x64-1.1.110.tar.xz", + "needsAuth": true, + "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", + "version": "1.1.110" + } + }, + "demo": { + "experimental": { + "name": "factorio_demo_x64-1.1.110.tar.xz", + "needsAuth": false, + "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" + }, + "stable": { + "name": "factorio_demo_x64-1.1.110.tar.xz", + "needsAuth": false, + "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" + } + }, + "headless": { + "experimental": { + "name": "factorio_headless_x64-1.1.110.tar.xz", + "needsAuth": false, + "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/headless/linux64", + "version": "1.1.110" + }, + "stable": { + "name": "factorio_headless_x64-1.1.110.tar.xz", + "needsAuth": false, + "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.110/headless/linux64", + "version": "1.1.110" + } + } + } +} diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 60e88c026f9d..63ea8becf28f 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,20 +2,20 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.110.tar.xz", + "name": "factorio_alpha_x64-2.0.8.tar.xz", "needsAuth": true, - "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", + "sha256": "11g1fgfm0lki9j2jsfmvlxzisbyx7482ia2qf7gnjcqhp6jkdsll", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.8/alpha/linux64", + "version": "2.0.8" }, "stable": { - "name": "factorio_alpha_x64-1.1.110.tar.xz", + "name": "factorio_alpha_x64-2.0.8.tar.xz", "needsAuth": true, - "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", + "sha256": "11g1fgfm0lki9j2jsfmvlxzisbyx7482ia2qf7gnjcqhp6jkdsll", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.8/alpha/linux64", + "version": "2.0.8" } }, "demo": { @@ -36,22 +36,32 @@ "version": "1.1.110" } }, + "expansion": { + "stable": { + "name": "factorio_expansion_x64-2.0.8.tar.xz", + "needsAuth": true, + "sha256": "0q3abb01ld1mlbp21lgzpa62j1gybs982yzan5j1axma9n1ax3j0", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.8/expansion/linux64", + "version": "2.0.8" + } + }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.110.tar.xz", + "name": "factorio_headless_x64-2.0.8.tar.xz", "needsAuth": false, - "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", + "sha256": "1jp1vlc4indicgy0xnrxq87h32wcv9s4g2hqbfb4ygiaam6lqnfr", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/headless/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.8/headless/linux64", + "version": "2.0.8" }, "stable": { - "name": "factorio_headless_x64-1.1.110.tar.xz", + "name": "factorio_headless_x64-2.0.8.tar.xz", "needsAuth": false, - "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", + "sha256": "1jp1vlc4indicgy0xnrxq87h32wcv9s4g2hqbfb4ygiaam6lqnfr", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/headless/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.8/headless/linux64", + "version": "2.0.8" } } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d74de4f4ad70..6de06c22c1c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36625,7 +36625,10 @@ with pkgs; fltk = fltk-minimal; }; - factorio = callPackage ../games/factorio { releaseType = "alpha"; }; + factorio = callPackage ../games/factorio { + releaseType = "alpha"; + versionsJson = ../games/factorio/versions-1.json; + }; factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; }; @@ -36635,6 +36638,30 @@ with pkgs; factorio-demo = factorio.override { releaseType = "demo"; }; + factorio_1 = factorio; + + factorio_1-experimental = factorio-experimental; + + factorio_1-headless = factorio-headless; + + factorio_1-headless-experimental = factorio-headless-experimental; + + factorio_1-demo = factorio-demo; + + factorio_2 = factorio.override { versionsJson = ../games/factorio/versions.json; }; + + factorio_2-experimental = factorio-experimental.override { versionsJson = ../games/factorio/versions.json; }; + + factorio_2-headless = factorio-headless.override { versionsJson = ../games/factorio/versions.json; }; + + factorio_2-headless-experimental = factorio-headless-experimental.override { versionsJson = ../games/factorio/versions.json; }; + + # there is no factorio_2-demo + + factorio-space-age = factorio_2.override { releaseType = "expansion"; }; + + factorio-space-age-experimental = factorio_2.override { releaseType = "expansion"; experimental = true; }; + factorio-mods = callPackage ../games/factorio/mods.nix { }; factorio-utils = callPackage ../games/factorio/utils.nix { };