From 21bce9b36bdd62be05107a623eb32fb9b1ca88bd Mon Sep 17 00:00:00 2001
From: Jarrod Pas <jarrod@jarrodpas.com>
Date: Mon, 8 Feb 2021 17:57:08 -0600
Subject: [PATCH 1/2] factorio: 1.1.19 -> 1.1.21

---
 pkgs/games/factorio/versions.json | 48 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index 4208df3acd05..a8f49d599548 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -2,56 +2,56 @@
   "x86_64-linux": {
     "alpha": {
       "experimental": {
-        "name": "factorio_alpha_x64-1.1.19.tar.xz",
+        "name": "factorio_alpha_x64-1.1.21.tar.xz",
         "needsAuth": true,
-        "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r",
+        "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.19/alpha/linux64",
-        "version": "1.1.19"
+        "url": "https://factorio.com/get-download/1.1.21/alpha/linux64",
+        "version": "1.1.21"
       },
       "stable": {
-        "name": "factorio_alpha_x64-1.1.19.tar.xz",
+        "name": "factorio_alpha_x64-1.1.21.tar.xz",
         "needsAuth": true,
-        "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r",
+        "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.19/alpha/linux64",
-        "version": "1.1.19"
+        "url": "https://factorio.com/get-download/1.1.21/alpha/linux64",
+        "version": "1.1.21"
       }
     },
     "demo": {
       "experimental": {
-        "name": "factorio_demo_x64-1.1.19.tar.xz",
+        "name": "factorio_demo_x64-1.1.21.tar.xz",
         "needsAuth": false,
-        "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr",
+        "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.19/demo/linux64",
-        "version": "1.1.19"
+        "url": "https://factorio.com/get-download/1.1.21/demo/linux64",
+        "version": "1.1.21"
       },
       "stable": {
-        "name": "factorio_demo_x64-1.1.19.tar.xz",
+        "name": "factorio_demo_x64-1.1.21.tar.xz",
         "needsAuth": false,
-        "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr",
+        "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.19/demo/linux64",
-        "version": "1.1.19"
+        "url": "https://factorio.com/get-download/1.1.21/demo/linux64",
+        "version": "1.1.21"
       }
     },
     "headless": {
       "experimental": {
-        "name": "factorio_headless_x64-1.1.19.tar.xz",
+        "name": "factorio_headless_x64-1.1.21.tar.xz",
         "needsAuth": false,
-        "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks",
+        "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.19/headless/linux64",
-        "version": "1.1.19"
+        "url": "https://factorio.com/get-download/1.1.21/headless/linux64",
+        "version": "1.1.21"
       },
       "stable": {
-        "name": "factorio_headless_x64-1.1.19.tar.xz",
+        "name": "factorio_headless_x64-1.1.21.tar.xz",
         "needsAuth": false,
-        "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks",
+        "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.19/headless/linux64",
-        "version": "1.1.19"
+        "url": "https://factorio.com/get-download/1.1.21/headless/linux64",
+        "version": "1.1.21"
       }
     }
   }

From 347c7fb266a0d806babed76d1f9cbfd2375dfd74 Mon Sep 17 00:00:00 2001
From: Jarrod Pas <jarrod@jarrodpas.com>
Date: Mon, 8 Feb 2021 18:37:24 -0600
Subject: [PATCH 2/2] factorio: change help message to output "$HOME"

Since $HOME was not escaped the user was shown a path inside /homeless-shelter
which could be confusing for inexperienced users.
---
 pkgs/games/factorio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 9db8a95746d4..356cedd3507e 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -42,7 +42,7 @@ let
 
       releaseType=alpha
       version=0.17.74
-      nix-prefetch-url file://$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz
+      nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz
 
     Note the ultimate "_" is replaced with "-" in the --name arg!
   '';