From 27008ddbb2eee8369187b3c101aa3867bae53ae4 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Wed, 12 Mar 2025 19:58:08 +0100 Subject: [PATCH 1/3] factorio, factorio-experimental: 2.0.32 -> 2.0.41 --- pkgs/by-name/fa/factorio/versions.json | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 7e1681792dd1..cc0e85adde33 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,25 +3,25 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.32.tar.xz" + "factorio_linux_2.0.41.tar.xz" ], - "name": "factorio_alpha_x64-2.0.32.tar.xz", + "name": "factorio_alpha_x64-2.0.41.tar.xz", "needsAuth": true, - "sha256": "4c3434986bbe7d10e02b742d36ecad36f13b7c125204bf2ad34f17b804cf611f", + "sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.32/alpha/linux64", - "version": "2.0.32" + "url": "https://factorio.com/get-download/2.0.41/alpha/linux64", + "version": "2.0.41" }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.32.tar.xz" + "factorio_linux_2.0.41.tar.xz" ], - "name": "factorio_alpha_x64-2.0.32.tar.xz", + "name": "factorio_alpha_x64-2.0.41.tar.xz", "needsAuth": true, - "sha256": "4c3434986bbe7d10e02b742d36ecad36f13b7c125204bf2ad34f17b804cf611f", + "sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.32/alpha/linux64", - "version": "2.0.32" + "url": "https://factorio.com/get-download/2.0.41/alpha/linux64", + "version": "2.0.41" } }, "demo": { @@ -50,51 +50,51 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.32.tar.xz" + "factorio-space-age_linux_2.0.41.tar.xz" ], - "name": "factorio_expansion_x64-2.0.32.tar.xz", + "name": "factorio_expansion_x64-2.0.41.tar.xz", "needsAuth": true, - "sha256": "51b1cad9d665015e200ea0f69619454ebf0f60557d1f78c857c4526dad2e3d77", + "sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.32/expansion/linux64", - "version": "2.0.32" + "url": "https://factorio.com/get-download/2.0.41/expansion/linux64", + "version": "2.0.41" }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.32.tar.xz" + "factorio-space-age_linux_2.0.41.tar.xz" ], - "name": "factorio_expansion_x64-2.0.32.tar.xz", + "name": "factorio_expansion_x64-2.0.41.tar.xz", "needsAuth": true, - "sha256": "51b1cad9d665015e200ea0f69619454ebf0f60557d1f78c857c4526dad2e3d77", + "sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.32/expansion/linux64", - "version": "2.0.32" + "url": "https://factorio.com/get-download/2.0.41/expansion/linux64", + "version": "2.0.41" } }, "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.32.tar.xz", - "factorio_headless_x64_2.0.32.tar.xz" + "factorio-headless_linux_2.0.41.tar.xz", + "factorio_headless_x64_2.0.41.tar.xz" ], - "name": "factorio_headless_x64-2.0.32.tar.xz", + "name": "factorio_headless_x64-2.0.41.tar.xz", "needsAuth": false, - "sha256": "2a6102ae42dcc5e8fe923bd68bcd326a569e35912acde121301e5d4d2d856417", + "sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.32/headless/linux64", - "version": "2.0.32" + "url": "https://factorio.com/get-download/2.0.41/headless/linux64", + "version": "2.0.41" }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.32.tar.xz", - "factorio_headless_x64_2.0.32.tar.xz" + "factorio-headless_linux_2.0.41.tar.xz", + "factorio_headless_x64_2.0.41.tar.xz" ], - "name": "factorio_headless_x64-2.0.32.tar.xz", + "name": "factorio_headless_x64-2.0.41.tar.xz", "needsAuth": false, - "sha256": "2a6102ae42dcc5e8fe923bd68bcd326a569e35912acde121301e5d4d2d856417", + "sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.32/headless/linux64", - "version": "2.0.32" + "url": "https://factorio.com/get-download/2.0.41/headless/linux64", + "version": "2.0.41" } } } From 5ac6a03d89930da60156bf07563b46414ff80d31 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Thu, 13 Mar 2025 11:54:06 +0100 Subject: [PATCH 2/3] factorio-demo: 1.1.110 -> 2.0.27, fix update script --- pkgs/by-name/fa/factorio/update.py | 2 +- pkgs/by-name/fa/factorio/versions.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fa/factorio/update.py b/pkgs/by-name/fa/factorio/update.py index 1fce95179804..a2322a3fb6fc 100755 --- a/pkgs/by-name/fa/factorio/update.py +++ b/pkgs/by-name/fa/factorio/update.py @@ -68,7 +68,7 @@ RELEASE_TYPES = [ needs_auth=True, hash_filename_format=["factorio_linux_{version}.tar.xz"], ), - ReleaseType("demo", hash_filename_format=["factorio_demo_x64_{version}.tar.xz"]), + ReleaseType("demo", hash_filename_format=["factorio-demo_linux_{version}.tar.xz"]), ReleaseType( "headless", hash_filename_format=[ diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index cc0e85adde33..3b062298d033 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -37,14 +37,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio_demo_x64_1.1.110.tar.xz" + "factorio-demo_linux_2.0.27.tar.xz" ], - "name": "factorio_demo_x64-1.1.110.tar.xz", + "name": "factorio_demo_x64-2.0.27.tar.xz", "needsAuth": false, - "sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35", + "sha256": "75938e76d0e730273616e2441ae3c3bc238bb3cfa38d34a43e5fb25a3d1f2323", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/demo/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.27/demo/linux64", + "version": "2.0.27" } }, "expansion": { From b0e0d97594e6566e8b30372add6ce7c785928653 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Thu, 13 Mar 2025 11:55:50 +0100 Subject: [PATCH 3/3] factorio-demo-experimental: init at 2.0.40 --- pkgs/by-name/fa/factorio/versions.json | 9 +++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 3b062298d033..c28ecb7d03d3 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -27,13 +27,14 @@ "demo": { "experimental": { "candidateHashFilenames": [ - "factorio_demo_x64_2.0.27.tar.xz" + "factorio-demo_linux_2.0.40.tar.xz" ], - "name": "factorio_demo_x64-2.0.27.tar.xz", + "name": "factorio_demo_x64-2.0.40.tar.xz", "needsAuth": false, + "sha256": "91ab921f8599c575f6090f5539090fb2eb42eb0d8bc83f366da078d995c639e6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.27/demo/linux64", - "version": "2.0.27" + "url": "https://factorio.com/get-download/2.0.40/demo/linux64", + "version": "2.0.40" }, "stable": { "candidateHashFilenames": [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5e2a2b94421..68119da755de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16140,6 +16140,8 @@ with pkgs; factorio-demo = factorio.override { releaseType = "demo"; }; + factorio-demo-experimental = factorio.override { releaseType = "demo"; experimental = true; }; + factorio-space-age = factorio.override { releaseType = "expansion"; }; factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; };