gemini-cli: 0.1.18 -> 0.1.21 (#433591)

pkgs/by-name/ge/gemini-cli/package.nix

@@ -2,30 +2,26 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  fetchpatch,
   gitUpdater,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.1.18";
+  version = "0.1.21";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vO70olSAG6NaZjyERU22lc8MbVivyJFieGcy0xOErrc=";
+    hash = "sha256-eS83Uwp6LzyQuIx2jirXnJ6Xb2XEaAKLnS9PMKTIvyI=";
   };
 
   patches = [
-    (fetchpatch {
-      url = "https://github.com/google-gemini/gemini-cli/pull/5336/commits/c1aef417d559237bf4d147c584449b74d6fbc1f8.patch";
-      name = "restore-missing-dependencies-fields.patch";
-      hash = "sha256-euRoLpbv075KIpYF9QPMba5FxG4+h/kxwLRetaay33s=";
-    })
+    # FIXME: remove once https://github.com/google-gemini/gemini-cli/pull/5336 is merged
+    ./restore-missing-dependencies-fields.patch
   ];
 
-  npmDepsHash = "sha256-8dn0i2laR4LFZk/sFDdvblvrHSnraGcLl3WAthCOKc0=";
+  npmDepsHash = "sha256-5pFnxZFhVNxYLPJClYq+pe4wAX5623Y3hFj8lIq00+E=";
 
   preConfigure = ''
     mkdir -p packages/generated
@@ -59,7 +55,10 @@ buildNpmPackage (finalAttrs: {
     description = "AI agent that brings the power of Gemini directly into your terminal";
     homepage = "https://github.com/google-gemini/gemini-cli";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [
+      donteatoreo
+      taranarmo
+    ];
     platforms = lib.platforms.all;
     mainProgram = "gemini";
   };

pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch

@@ -0,0 +1,69 @@
+From c1aef417d559237bf4d147c584449b74d6fbc1f8 Mon Sep 17 00:00:00 2001
+From: ljxfstorm <ljxf.storm@live.cn>
+Date: Fri, 1 Aug 2025 10:23:11 +0800
+Subject: [PATCH] build(deps): restore missing `resolved` and `integrity` of
+ some dependencies
+
+---
+ package-lock.json | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/package-lock.json b/package-lock.json
+index 3938c5e32b..99590b8a9b 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -11738,6 +11738,8 @@
+     },
+     "packages/cli/node_modules/@testing-library/dom": {
+       "version": "10.4.0",
++      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
++      "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
+       "dev": true,
+       "license": "MIT",
+       "peer": true,
+@@ -11773,6 +11775,8 @@
+     },
+     "packages/cli/node_modules/@testing-library/react": {
+       "version": "16.3.0",
++      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.0.tgz",
++      "integrity": "sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -11824,6 +11828,8 @@
+     },
+     "packages/cli/node_modules/aria-query": {
+       "version": "5.3.0",
++      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
++      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+       "dev": true,
+       "license": "Apache-2.0",
+       "peer": true,
+@@ -11833,6 +11839,8 @@
+     },
+     "packages/cli/node_modules/emoji-regex": {
+       "version": "10.4.0",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
++      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+       "license": "MIT"
+     },
+     "packages/cli/node_modules/react-is": {
+@@ -11845,6 +11853,8 @@
+     },
+     "packages/cli/node_modules/string-width": {
+       "version": "7.2.0",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
++      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+       "license": "MIT",
+       "dependencies": {
+         "emoji-regex": "^10.3.0",
+@@ -11942,6 +11952,8 @@
+     },
+     "packages/core/node_modules/ignore": {
+       "version": "7.0.5",
++      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
++      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+       "license": "MIT",
+       "engines": {
+         "node": ">= 4"
+