summary refs log tree commit diff
diff options
context:
space:
mode:
authorfigsoda2023-05-14 23:20:31 -0400
committerGitHub2023-05-14 23:20:31 -0400
commitfd106e6a9f6214189bdf374b54347a6806d1e954 (patch)
treecc2783c38bdbbdfca0268ba5d9ebee9e8ac3a4aa
parentd39fb92eb224b99d0283f3b04adbe59468d81e14 (diff)
parent893c521565957bdf54962d542b77cadace030b07 (diff)
Merge pull request #231832 from dit7ya/mods
mods: init at 0.1.1
-rw-r--r--pkgs/games/factorio/default.nix6
-rw-r--r--pkgs/tools/misc/mods/default.nix27
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 33 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===
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 7cf08b721f0d..38c1dd12f3df 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 {