commit 16c865ce4f670206538e3f768a72461cd7a1f50f · pyrox.dev/nixpkgs

+29 -10

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

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         nix-update-script,

     

       6
       6
        
         ripgrep,

     

       7
       7
       +
         jq,

     

       8
       8
       +
         pkg-config,

     

       9
       9
       +
         libsecret,

     

       7
       10
        
       }:

     

       8
       11
        
       

     

       9
       12
        
       buildNpmPackage (finalAttrs: {

     

       10
       13
        
         pname = "gemini-cli";

     

       11
       11
       -
         version = "0.3.4";

     

       14
       14
       +
         version = "0.4.1";

     

       12
       15
        
       

     

       13
       16
        
         src = fetchFromGitHub {

     

       14
       17
        
           owner = "google-gemini";

     

       15
       18
        
           repo = "gemini-cli";

     

       16
       19
        
           tag = "v${finalAttrs.version}";

     

       17
       17
       -
           hash = "sha256-nlDXWAfFmhRwfZ46knUeF5ar6huPFLJ5wSxcts4bjfM=";

     

       20
       20
       +
           hash = "sha256-SyYergPmEyIcDyU0tF20pvu1qOCRfMRozh0/9nnaefU=";

     

       18
       21
        
         };

     

       19
       22
        
       

     

       20
       20
       -
         patches = [

     

       21
       21
       -
           # FIXME: remove once https://github.com/google-gemini/gemini-cli/pull/5336 is merged

     

       22
       22
       -
           # FIXME: PR is merged though package is failing without the patch

     

       23
       23
       -
           ./restore-missing-dependencies-fields.patch

     

       24
       24
       -
           # removes @lvce-editor/ripgrep and make upstream code to use ripgrep from nixpkgs

     

       25
       25
       -
           ./replace-npm-s-ripgrep-with-local.patch

     

       26
       26
       -
         ];

     

       23
       23
       +
         npmDepsHash = "sha256-4S1wMl1agTYOwJ8S/CsXHG+JRx40Nee23TmoJyTYoII=";

     

       27
       24
        
       

     

       28
       28
       -
         npmDepsHash = "sha256-q7E5YEMjHs9RvfT4ctzltqHr/+cCh3M+G6D2MkLiJFg=";

     

       25
       25
       +
         nativeBuildInputs = [

     

       26
       26
       +
           jq

     

       27
       27
       +
           pkg-config

     

       28
       28
       +
         ];

     

       29
       29
        
       

     

       30
       30
        
         buildInputs = [

     

       31
       31
        
           ripgrep

     

       32
       32
       +
           libsecret

     

       32
       33
        
         ];

     

       33
       34
        
       

     

       34
       35
        
         preConfigure = ''

     

       35
       36
        
           mkdir -p packages/generated

     

       36
       37
        
           echo "export const GIT_COMMIT_INFO = { commitHash: '${finalAttrs.src.rev}' };" > packages/generated/git-commit.ts

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       40
       40
       +
         postPatch = ''

     

       41
       41
       +
           # Remove node-pty dependency from package.json

     

       42
       42
       +
           jq 'del(.optionalDependencies."node-pty")' package.json > package.json.tmp && mv package.json.tmp package.json

     

       43
       43
       +
       

     

       44
       44
       +
           # Remove node-pty dependency from packages/core/package.json

     

       45
       45
       +
           jq 'del(.optionalDependencies."node-pty")' packages/core/package.json > packages/core/package.json.tmp && mv packages/core/package.json.tmp packages/core/package.json

     

       46
       46
       +
       

     

       47
       47
       +
           # Remove @lvce-editor/ripgrep dependency from package.json

     

       48
       48
       +
           substituteInPlace package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' ""

     

       49
       49
       +
       

     

       50
       50
       +
           # Remove @lvce-editor/ripgrep dependency from packages/core/package.json

     

       51
       51
       +
           substituteInPlace packages/core/package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' ""

     

       52
       52
       +
       

     

       53
       53
       +
           # Modify ripGrep.ts to use system ripgrep instead of @lvce-editor/ripgrep

     

       54
       54
       +
           substituteInPlace packages/core/src/tools/ripGrep.ts \

     

       55
       55
       +
             --replace-fail "import { rgPath } from '@lvce-editor/ripgrep';" "const rgPath = 'rg';"

     

       37
       56
        
         '';

     

       38
       57
        
       

     

       39
       58
        
         installPhase = ''

-114

pkgs/by-name/ge/gemini-cli/replace-npm-s-ripgrep-with-local.patch

···

       1
       1
       -
       From aee25e0140635d1d9c51b6b171c2a311c2061f1d Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Sergey Volkov <taranarmo@gmail.com>

     

       3
       3
       -
       Date: Sun, 7 Sep 2025 13:12:02 +0200

     

       4
       4
       -
       Subject: [PATCH] replace npm's ripgrep with local

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        package-lock.json                  | 28 ----------------------------

     

       8
       8
       -
        package.json                       |  1 -

     

       9
       9
       -
        packages/core/package.json         |  1 -

     

       10
       10
       -
        packages/core/src/tools/ripGrep.ts |  4 ++--

     

       11
       11
       -
        4 files changed, 2 insertions(+), 32 deletions(-)

     

       12
       12
       -
       

     

       13
       13
       -
       diff --git a/package-lock.json b/package-lock.json

     

       14
       14
       -
       index 7448c7e6..809cb322 100644

     

       15
       15
       -
       --- a/package-lock.json

     

       16
       16
       -
       +++ b/package-lock.json

     

       17
       17
       -
       @@ -11,7 +11,6 @@

     

       18
       18
       -
                "packages/*"

     

       19
       19
       -
              ],

     

       20
       20
       -
              "dependencies": {

     

       21
       21
       -
       -        "@lvce-editor/ripgrep": "^1.6.0",

     

       22
       22
       -
                "simple-git": "^3.28.0",

     

       23
       23
       -
                "strip-ansi": "^7.1.0"

     

       24
       24
       -
              },

     

       25
       25
       -
       @@ -1603,32 +1602,6 @@

     

       26
       26
       -
              "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",

     

       27
       27
       -
              "license": "MIT"

     

       28
       28
       -
            },

     

       29
       29
       -
       -    "node_modules/@lvce-editor/ripgrep": {

     

       30
       30
       -
       -      "version": "1.6.0",

     

       31
       31
       -
       -      "resolved": "https://registry.npmjs.org/@lvce-editor/ripgrep/-/ripgrep-1.6.0.tgz",

     

       32
       32
       -
       -      "integrity": "sha512-880taWBVULNXmcPHXdxnFUI0FvLErBOjY9OigMXEsLZ2Q1rjcm6LixOkaccKWC8qFMpzm/ldkO7WOMK+ZRfk5Q==",

     

       33
       33
       -
       -      "hasInstallScript": true,

     

       34
       34
       -
       -      "license": "MIT",

     

       35
       35
       -
       -      "dependencies": {

     

       36
       36
       -
       -        "@lvce-editor/verror": "^1.6.0",

     

       37
       37
       -
       -        "execa": "^9.5.2",

     

       38
       38
       -
       -        "extract-zip": "^2.0.1",

     

       39
       39
       -
       -        "fs-extra": "^11.3.0",

     

       40
       40
       -
       -        "got": "^14.4.5",

     

       41
       41
       -
       -        "path-exists": "^5.0.0",

     

       42
       42
       -
       -        "tempy": "^3.1.0",

     

       43
       43
       -
       -        "xdg-basedir": "^5.1.0"

     

       44
       44
       -
       -      }

     

       45
       45
       -
       -    },

     

       46
       46
       -
       -    "node_modules/@lvce-editor/ripgrep/node_modules/path-exists": {

     

       47
       47
       -
       -      "version": "5.0.0",

     

       48
       48
       -
       -      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",

     

       49
       49
       -
       -      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",

     

       50
       50
       -
       -      "license": "MIT",

     

       51
       51
       -
       -      "engines": {

     

       52
       52
       -
       -        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"

     

       53
       53
       -
       -      }

     

       54
       54
       -
       -    },

     

       55
       55
       -
            "node_modules/@lvce-editor/verror": {

     

       56
       56
       -
              "version": "1.7.0",

     

       57
       57
       -
              "resolved": "https://registry.npmjs.org/@lvce-editor/verror/-/verror-1.7.0.tgz",

     

       58
       58
       -
       @@ -14693,7 +14666,6 @@

     

       59
       59
       -
              "version": "0.3.4",

     

       60
       60
       -
              "dependencies": {

     

       61
       61
       -
                "@google/genai": "1.13.0",

     

       62
       62
       -
       -        "@lvce-editor/ripgrep": "^1.6.0",

     

       63
       63
       -
                "@modelcontextprotocol/sdk": "^1.11.0",

     

       64
       64
       -
                "@opentelemetry/api": "^1.9.0",

     

       65
       65
       -
                "@opentelemetry/exporter-logs-otlp-grpc": "^0.203.0",

     

       66
       66
       -
       diff --git a/package.json b/package.json

     

       67
       67
       -
       index 232ee82c..7efc1072 100644

     

       68
       68
       -
       --- a/package.json

     

       69
       69
       -
       +++ b/package.json

     

       70
       70
       -
       @@ -92,7 +92,6 @@

     

       71
       71
       -
            "yargs": "^17.7.2"

     

       72
       72
       -
          },

     

       73
       73
       -
          "dependencies": {

     

       74
       74
       -
       -    "@lvce-editor/ripgrep": "^1.6.0",

     

       75
       75
       -
            "simple-git": "^3.28.0",

     

       76
       76
       -
            "strip-ansi": "^7.1.0"

     

       77
       77
       -
          },

     

       78
       78
       -
       diff --git a/packages/core/package.json b/packages/core/package.json

     

       79
       79
       -
       index a8ef7a22..37fbd775 100644

     

       80
       80
       -
       --- a/packages/core/package.json

     

       81
       81
       -
       +++ b/packages/core/package.json

     

       82
       82
       -
       @@ -21,7 +21,6 @@

     

       83
       83
       -
          ],

     

       84
       84
       -
          "dependencies": {

     

       85
       85
       -
            "@google/genai": "1.13.0",

     

       86
       86
       -
       -    "@lvce-editor/ripgrep": "^1.6.0",

     

       87
       87
       -
            "@modelcontextprotocol/sdk": "^1.11.0",

     

       88
       88
       -
            "@opentelemetry/api": "^1.9.0",

     

       89
       89
       -
            "@opentelemetry/exporter-logs-otlp-grpc": "^0.203.0",

     

       90
       90
       -
       diff --git a/packages/core/src/tools/ripGrep.ts b/packages/core/src/tools/ripGrep.ts

     

       91
       91
       -
       index b851c2cd..fa846a38 100644

     

       92
       92
       -
       --- a/packages/core/src/tools/ripGrep.ts

     

       93
       93
       -
       +++ b/packages/core/src/tools/ripGrep.ts

     

       94
       94
       -
       @@ -8,7 +8,7 @@ import fs from 'node:fs';

     

       95
       95
       -
        import path from 'node:path';

     

       96
       96
       -
        import { EOL } from 'node:os';

     

       97
       97
       -
        import { spawn } from 'node:child_process';

     

       98
       98
       -
       -import { rgPath } from '@lvce-editor/ripgrep';

     

       99
       99
       -
       +

     

       100
       100
       -
        import type { ToolInvocation, ToolResult } from './tools.js';

     

       101
       101
       -
        import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';

     

       102
       102
       -
        import { SchemaValidator } from '../utils/schemaValidator.js';

     

       103
       103
       -
       @@ -293,7 +293,7 @@ class GrepToolInvocation extends BaseToolInvocation<

     

       104
       104
       -
        

     

       105
       105
       -
            try {

     

       106
       106
       -
              const output = await new Promise<string>((resolve, reject) => {

     

       107
       107
       -
       -        const child = spawn(rgPath, rgArgs, {

     

       108
       108
       -
       +        const child = spawn('rg', rgArgs, {

     

       109
       109
       -
                  windowsHide: true,

     

       110
       110
       -
                });

     

       111
       111
       -
        

     

       112
       112
       -
       -- 

     

       113
       113
       -
       2.50.1

     

       114
       114
       -

-109

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

···

       1
       1
       -
       diff --git a/package-lock.json b/package-lock.json

     

       2
       2
       -
       index 74cfbfef..4131aa2b 100644

     

       3
       3
       -
       --- a/package-lock.json

     

       4
       4
       -
       +++ b/package-lock.json

     

       5
       5
       -
       @@ -58,8 +58,7 @@

     

       6
       6
       -
                "@lydell/node-pty-darwin-x64": "1.1.0",

     

       7
       7
       -
                "@lydell/node-pty-linux-x64": "1.1.0",

     

       8
       8
       -
                "@lydell/node-pty-win32-arm64": "1.1.0",

     

       9
       9
       -
       -        "@lydell/node-pty-win32-x64": "1.1.0",

     

       10
       10
       -
       -        "node-pty": "^1.0.0"

     

       11
       11
       -
       +        "@lydell/node-pty-win32-x64": "1.1.0"

     

       12
       12
       -
              }

     

       13
       13
       -
            },

     

       14
       14
       -
            "node_modules/@alcalzone/ansi-tokenize": {

     

       15
       15
       -
       @@ -8604,17 +8603,6 @@

     

       16
       16
       -
                "url": "https://opencollective.com/node-fetch"

     

       17
       17
       -
              }

     

       18
       18
       -
            },

     

       19
       19
       -
       -    "node_modules/node-pty": {

     

       20
       20
       -
       -      "version": "1.0.0",

     

       21
       21
       -
       -      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.0.0.tgz",

     

       22
       22
       -
       -      "integrity": "sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==",

     

       23
       23
       -
       -      "hasInstallScript": true,

     

       24
       24
       -
       -      "license": "MIT",

     

       25
       25
       -
       -      "optional": true,

     

       26
       26
       -
       -      "dependencies": {

     

       27
       27
       -
       -        "nan": "^2.17.0"

     

       28
       28
       -
       -      }

     

       29
       29
       -
       -    },

     

       30
       30
       -
            "node_modules/normalize-package-data": {

     

       31
       31
       -
              "version": "6.0.2",

     

       32
       32
       -
              "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",

     

       33
       33
       -
       @@ -12535,6 +12523,8 @@

     

       34
       34
       -
            },

     

       35
       35
       -
            "packages/cli/node_modules/@testing-library/dom": {

     

       36
       36
       -
              "version": "10.4.0",

     

       37
       37
       -
       +      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",

     

       38
       38
       -
       +      "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",

     

       39
       39
       -
              "dev": true,

     

       40
       40
       -
              "license": "MIT",

     

       41
       41
       -
              "peer": true,

     

       42
       42
       -
       @@ -12570,6 +12560,8 @@

     

       43
       43
       -
            },

     

       44
       44
       -
            "packages/cli/node_modules/@testing-library/react": {

     

       45
       45
       -
              "version": "16.3.0",

     

       46
       46
       -
       +      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.0.tgz",

     

       47
       47
       -
       +      "integrity": "sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==",

     

       48
       48
       -
              "dev": true,

     

       49
       49
       -
              "license": "MIT",

     

       50
       50
       -
              "dependencies": {

     

       51
       51
       -
       @@ -12621,6 +12613,8 @@

     

       52
       52
       -
            },

     

       53
       53
       -
            "packages/cli/node_modules/aria-query": {

     

       54
       54
       -
              "version": "5.3.0",

     

       55
       55
       -
       +      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",

     

       56
       56
       -
       +      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",

     

       57
       57
       -
              "dev": true,

     

       58
       58
       -
              "license": "Apache-2.0",

     

       59
       59
       -
              "peer": true,

     

       60
       60
       -
       @@ -12630,6 +12624,8 @@

     

       61
       61
       -
            },

     

       62
       62
       -
            "packages/cli/node_modules/emoji-regex": {

     

       63
       63
       -
              "version": "10.4.0",

     

       64
       64
       -
       +      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",

     

       65
       65
       -
       +      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",

     

       66
       66
       -
              "license": "MIT"

     

       67
       67
       -
            },

     

       68
       68
       -
            "packages/cli/node_modules/react-is": {

     

       69
       69
       -
       @@ -12642,6 +12638,8 @@

     

       70
       70
       -
            },

     

       71
       71
       -
            "packages/cli/node_modules/string-width": {

     

       72
       72
       -
              "version": "7.2.0",

     

       73
       73
       -
       +      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",

     

       74
       74
       -
       +      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",

     

       75
       75
       -
              "license": "MIT",

     

       76
       76
       -
              "dependencies": {

     

       77
       77
       -
                "emoji-regex": "^10.3.0",

     

       78
       78
       -
       @@ -12715,8 +12713,7 @@

     

       79
       79
       -
                "@lydell/node-pty-darwin-x64": "1.1.0",

     

       80
       80
       -
                "@lydell/node-pty-linux-x64": "1.1.0",

     

       81
       81
       -
                "@lydell/node-pty-win32-arm64": "1.1.0",

     

       82
       82
       -
       -        "@lydell/node-pty-win32-x64": "1.1.0",

     

       83
       83
       -
       -        "node-pty": "^1.0.0"

     

       84
       84
       -
       +        "@lydell/node-pty-win32-x64": "1.1.0"

     

       85
       85
       -
              }

     

       86
       86
       -
            },

     

       87
       87
       -
            "packages/core/node_modules/ajv": {

     

       88
       88
       -
       @@ -12751,6 +12748,8 @@

     

       89
       89
       -
            },

     

       90
       90
       -
            "packages/core/node_modules/ignore": {

     

       91
       91
       -
              "version": "7.0.5",

     

       92
       92
       -
       +      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",

     

       93
       93
       -
       +      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",

     

       94
       94
       -
              "license": "MIT",

     

       95
       95
       -
              "engines": {

     

       96
       96
       -
                "node": ">= 4"

     

       97
       97
       -
       diff --git a/package.json b/package.json

     

       98
       98
       -
       index aba2aa98..57c79274 100644

     

       99
       99
       -
       --- a/package.json

     

       100
       100
       -
       +++ b/package.json

     

       101
       101
       -
       @@ -100,7 +100,6 @@

     

       102
       102
       -
            "@lydell/node-pty-darwin-x64": "1.1.0",

     

       103
       103
       -
            "@lydell/node-pty-linux-x64": "1.1.0",

     

       104
       104
       -
            "@lydell/node-pty-win32-arm64": "1.1.0",

     

       105
       105
       -
       -    "@lydell/node-pty-win32-x64": "1.1.0",

     

       106
       106
       -
       -    "node-pty": "^1.0.0"

     

       107
       107
       -
       +    "@lydell/node-pty-win32-x64": "1.1.0"

     

       108
       108
       -
          }

     

       109
       109
       -
        }