From b40c001070fcdddf88b637e111d76f55440c29de Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Tue, 29 Oct 2024 11:49:02 +0000 Subject: [PATCH] factorio: introduce _1 and _2 packages Freeze versions into a separate versions.json for _1; there are unlikely to be any more releases in that series, and this means that cherry-picking version updates from master will update the correct file. So far the _2 packages are misnamed because I haven't done the cherry-picking yet, but that will be fixed next. --- pkgs/games/factorio/versions-1.json | 58 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 25 ++++++++++++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/factorio/versions-1.json 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86fc821111e2..ac7767c626d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36621,7 +36621,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; }; @@ -36631,6 +36634,26 @@ 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-mods = callPackage ../games/factorio/mods.nix { }; factorio-utils = callPackage ../games/factorio/utils.nix { };