From 3830fa6e2816e217be8477e8c12300383476f9bc Mon Sep 17 00:00:00 2001
From: Mostly Void <7rat13@gmail.com>
Date: Sun, 14 May 2023 17:14:04 +0530
Subject: [PATCH 1/2] mods: init at 0.1.1

---
 pkgs/tools/misc/mods/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/misc/mods/default.nix

diff --git a/pkgs/tools/misc/mods/default.nix b/pkgs/tools/misc/mods/default.nix
new file mode 100644
index 000000000000..83b1e7db1052
--- /dev/null
+++ b/pkgs/tools/misc/mods/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "mods";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "charmbracelet";
+    repo = "mods";
+    rev = "v${version}";
+    hash = "sha256-r7j7iMkfkFsohguu2vkhyxUbaMwJQURfUJrnC6yUCFI=";
+  };
+
+  vendorHash = "sha256-+0yGFCGd/9bIBjXYp8UPGqKum2di5O1ALMyDSxcVujg=";
+
+  ldflags = [ "-s" "-w" "-X=main.version=${version}" ];
+
+  meta = with lib; {
+    description = "AI on the command line";
+    homepage = "https://github.com/charmbracelet/mods";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dit7ya ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65f67d57e2c5..76efed713efc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -882,6 +882,8 @@ with pkgs;
 
   mod = callPackage ../development/tools/mod { };
 
+  mods = callPackage ../tools/misc/mods { };
+
   mongosh = callPackage ../development/tools/mongosh { };
 
   mysql-shell = callPackage ../development/tools/mysql-shell {

From 893c521565957bdf54962d542b77cadace030b07 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 14 May 2023 10:27:47 -0400
Subject: [PATCH 2/2] factorio: fix eval

---
 pkgs/games/factorio/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 97df1c6c249b..7851cd6e8d1e 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -19,13 +19,13 @@
 , stdenv
 , wayland
 
-, mods ? [ ]
 , mods-dat ? null
 , versionsJson ? ./versions.json
 , username ? ""
 , token ? "" # get/reset token at https://factorio.com/profile
 , experimental ? false # true means to always use the latest branch
-}:
+, ...
+} @ args:
 
 assert releaseType == "alpha"
   || releaseType == "headless"
@@ -35,6 +35,8 @@ let
 
   inherit (lib) importJSON;
 
+  mods = args.mods or [ ];
+
   helpMsg = ''
 
     ===FETCH FAILED===