Skip to content

[Backport to release-25.11] gemini-cli: 0.17.1 -> 0.25.2 #485405

Open
FlameFlag wants to merge 14 commits intoNixOS:release-25.11from
FlameFlag:flameflag/push-swzvvkxtvtwk
Open

[Backport to release-25.11] gemini-cli: 0.17.1 -> 0.25.2 #485405
FlameFlag wants to merge 14 commits intoNixOS:release-25.11from
FlameFlag:flameflag/push-swzvvkxtvtwk

Conversation

@FlameFlag
Copy link
Member

@FlameFlag FlameFlag commented Jan 30, 2026

Closes:
#485368

Backports of:
#466152
#468089
#470095
#471774
#472079
#474041
#474579
#475393
#475559
#477740
#478302
#477740
#484014
#484014

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 7cc320d and original 776341a may warrant inspection.

Show diff
@@ Metadata
  ## Commit message ##
     gemini-cli: 0.22.2 -> 0.22.4
 
+    (cherry picked from commit 776341a9e3afe4e8b538974823a6e0cc26f4e0a0)
+
  ## maintainers/maintainer-list.nix ##
 @@
+     github = "brancz";
      githubId = 4546722;
    };
-   brantes = {
--    name = "Pedro Brantes"
++  brantes = {
 +    name = "Pedro Brantes";
-     email = "contact@brantes.simplelogin.com";
-     github = "pedrobrantes";
-     githubId = 58346706;
++    email = "contact@brantes.simplelogin.com";
++    github = "pedrobrantes";
++    githubId = 58346706;
++    matrix = "@brantes:matrix.org";
++  };
+   braydenjw = {
+     email = "nixpkgs@willenborg.ca";
+     github = "braydenjw";
 
  ## pkgs/by-name/ge/gemini-cli/package.nix ##
 @@

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

r-ryantm and others added 14 commits January 30, 2026 19:11
(cherry picked from commit 2f9a060)
(cherry picked from commit 4d5d5e3)
(cherry picked from commit 89f7553)
(cherry picked from commit 5ec6f86)
(cherry picked from commit 776341a)
(cherry picked from commit fea71ef)
(cherry picked from commit 8a1d15f)
Previously, this package relied on `ensureRgPath()` to locate a bundled
`ripgrep` binary. This caused runtime failures in the `SearchText` tool
on NixOS (specifically observed on aarch64-linux), as the bundled binary is
dynamically linked and lacks required libraries.

This change substitutes `gemini-cli`'s internal binary resolution (`ensureRgPath()`) with the absolute path to `ripgrep`'s binary in the Nix store .

(cherry picked from commit 6c1a7d4)
(cherry picked from commit 4e08c4b)
(cherry picked from commit 4e3cda2)
@FlameFlag FlameFlag force-pushed the flameflag/push-swzvvkxtvtwk branch from 6723f24 to af6b294 Compare January 30, 2026 17:13
@nixpkgs-ci nixpkgs-ci bot added 8.has: package (update) This PR updates a package to a newer version 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 4.workflow: backport This targets a stable branch labels Jan 30, 2026
@FlameFlag
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 485405
Commit: af6b29432a28bdad2334bdd2e278ac00aef489aa (subsequent changes)
Merge: 364778db2f398def0b41ebcc308340c21952b5ea

Logs: https://github.com/FlameFlag/nixpkgs-review-gha/actions/runs/21524427899


x86_64-linux

✅ 2 packages built:
  • gemini-cli
  • vscode-extensions.Google.gemini-cli-vscode-ide-companion

aarch64-linux

✅ 2 packages built:
  • gemini-cli
  • vscode-extensions.Google.gemini-cli-vscode-ide-companion

x86_64-darwin (sandbox = relaxed)

✅ 2 packages built:
  • gemini-cli
  • vscode-extensions.Google.gemini-cli-vscode-ide-companion

aarch64-darwin (sandbox = relaxed)

✅ 2 packages built:
  • gemini-cli
  • vscode-extensions.Google.gemini-cli-vscode-ide-companion

Copy link
Member

@Hythera Hythera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I can't find any breaking changes in the changelog.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 30, 2026
Copy link
Contributor

@taranarmo taranarmo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as well, though I don't have NixOS 25.11 at hand to test the diff looks okay and shouldn't cause issues

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Feb 3, 2026
@nixpkgs-ci nixpkgs-ci bot added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Feb 3, 2026
@lostmsu
Copy link
Contributor

lostmsu commented Feb 4, 2026

What's needed to get this merged?

@Hythera
Copy link
Member

Hythera commented Feb 4, 2026

Only a commiter or higher with write access can currently merge this PR :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants