commit 00b45a3f5d9b568e361665f2820c5c81921b0b2a · pyrox.dev/nixpkgs

+70

pkgs/by-name/qw/qwen-code/add-missing-resolved-integrity-fields.patch

···

       1
       1
       +
       From 0735b59eba183574e080d2912347d58e6e3d158e Mon Sep 17 00:00:00 2001

     

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

     

       3
       3
       +
       Date: Fri, 12 Sep 2025 20:06:24 +0200

     

       4
       4
       +
       Subject: [PATCH] Add missing resolved and integrity fields to several packages

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        package-lock.json | 12 ++++++++++++

     

       8
       8
       +
        1 file changed, 12 insertions(+)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/package-lock.json b/package-lock.json

     

       11
       11
       +
       index 146686dc..9ad9009f 100644

     

       12
       12
       +
       --- a/package-lock.json

     

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

     

       14
       14
       +
       @@ -12574,6 +12574,8 @@

     

       15
       15
       +
            },

     

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

     

       17
       17
       +
              "version": "10.4.0",

     

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

     

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

     

       20
       20
       +
              "dev": true,

     

       21
       21
       +
              "license": "MIT",

     

       22
       22
       +
              "peer": true,

     

       23
       23
       +
       @@ -12609,6 +12611,8 @@

     

       24
       24
       +
            },

     

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

     

       26
       26
       +
              "version": "16.3.0",

     

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

     

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

     

       29
       29
       +
              "dev": true,

     

       30
       30
       +
              "license": "MIT",

     

       31
       31
       +
              "dependencies": {

     

       32
       32
       +
       @@ -12660,6 +12664,8 @@

     

       33
       33
       +
            },

     

       34
       34
       +
            "packages/cli/node_modules/aria-query": {

     

       35
       35
       +
              "version": "5.3.0",

     

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

     

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

     

       38
       38
       +
              "dev": true,

     

       39
       39
       +
              "license": "Apache-2.0",

     

       40
       40
       +
              "peer": true,

     

       41
       41
       +
       @@ -12669,6 +12675,8 @@

     

       42
       42
       +
            },

     

       43
       43
       +
            "packages/cli/node_modules/emoji-regex": {

     

       44
       44
       +
              "version": "10.4.0",

     

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

     

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

     

       47
       47
       +
              "license": "MIT"

     

       48
       48
       +
            },

     

       49
       49
       +
            "packages/cli/node_modules/react-is": {

     

       50
       50
       +
       @@ -12681,6 +12689,8 @@

     

       51
       51
       +
            },

     

       52
       52
       +
            "packages/cli/node_modules/string-width": {

     

       53
       53
       +
              "version": "7.2.0",

     

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

     

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

     

       56
       56
       +
              "license": "MIT",

     

       57
       57
       +
              "dependencies": {

     

       58
       58
       +
                "emoji-regex": "^10.3.0",

     

       59
       59
       +
       @@ -12815,6 +12825,8 @@

     

       60
       60
       +
            },

     

       61
       61
       +
            "packages/core/node_modules/ignore": {

     

       62
       62
       +
              "version": "7.0.5",

     

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

     

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

     

       65
       65
       +
              "license": "MIT",

     

       66
       66
       +
              "engines": {

     

       67
       67
       +
                "node": ">= 4"

     

       68
       68
       +
       -- 

     

       69
       69
       +
       2.51.0

     

       70
       70
       +

+42 -11

pkgs/by-name/qw/qwen-code/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildNpmPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchNpmDeps,

     

       6
       5
        
         nix-update-script,

     

       6
       6
       +
         jq,

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildNpmPackage (finalAttrs: {

     

       10
       10
        
         pname = "qwen-code";

     

       11
       11
       -
         version = "0.0.6";

     

       11
       11
       +
         version = "0.0.11";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "QwenLM";

     

       15
       15
        
           repo = "qwen-code";

     

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

     

       17
       17
       -
           hash = "sha256-s4+1hqdlJh5jOy6uZz608n5DzuBR+v/s+7D85oFwQIY=";

     

       17
       17
       +
           hash = "sha256-5qKSWbc0NPpgvt36T/gRSgm1+o2Pbdw3tgfcGba6YSs=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         npmDeps = fetchNpmDeps {

     

       21
       21
       -
           inherit (finalAttrs) src;

     

       22
       22
       -
           hash = "sha256-cGO66hQxgpoxphtt/BPPDIBuAG8yQseCdzUdAO2mkr4=";

     

       23
       23
       -
         };

     

       20
       20
       +
         patches = [

     

       21
       21
       +
           # similar to upstream gemini-cli some node deps are missing resolved and integrity fields

     

       22
       22
       +
           # upstream the problem is solved in master and in v0.4+, eventually the fix should arrive to qwen

     

       23
       23
       +
           ./add-missing-resolved-integrity-fields.patch

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         npmDepsHash = "sha256-XvJO3ylm/ER5neSubci2w9OCTmqobmmXLbKmdQAqArY=";

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           jq

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         postPatch = ''

     

       33
       33
       +
           # patches below remove node-pty dependency which causes build fail on Darwin

     

       34
       34
       +
           # should be conditional on platform but since package-lock.json is patched it changes its hash

     

       35
       35
       +
           # though seems like this dependency is not really required by the package

     

       36
       36
       +
           ${jq}/bin/jq '

     

       37
       37
       +
             del(.packages."node_modules/node-pty") |

     

       38
       38
       +
             del(.packages."node_modules/@lydell/node-pty") |

     

       39
       39
       +
             del(.packages."node_modules/@lydell/node-pty-darwin-arm64") |

     

       40
       40
       +
             del(.packages."node_modules/@lydell/node-pty-darwin-x64") |

     

       41
       41
       +
             del(.packages."node_modules/@lydell/node-pty-linux-arm64") |

     

       42
       42
       +
             del(.packages."node_modules/@lydell/node-pty-linux-x64") |

     

       43
       43
       +
             del(.packages."node_modules/@lydell/node-pty-win32-arm64") |

     

       44
       44
       +
             del(.packages."node_modules/@lydell/node-pty-win32-x64") |

     

       45
       45
       +
             walk(

     

       46
       46
       +
               if type == "object" and has("dependencies") then

     

       47
       47
       +
                 .dependencies |= with_entries(select(.key | contains("node-pty") | not))

     

       48
       48
       +
               elif type == "object" and has("optionalDependencies") then

     

       49
       49
       +
                 .optionalDependencies |= with_entries(select(.key | contains("node-pty") | not))

     

       50
       50
       +
               else .

     

       51
       51
       +
               end

     

       52
       52
       +
             )

     

       53
       53
       +
           ' package-lock.json > package-lock.json.tmp && mv package-lock.json.tmp package-lock.json

     

       54
       54
       +
         '';

     

       24
       55
        
       

     

       25
       56
        
         buildPhase = ''

     

       26
       57
        
           runHook preBuild

     
···

       34
       65
        
         installPhase = ''

     

       35
       66
        
           runHook preInstall

     

       36
       67
        
       

     

       37
       37
       -
           mkdir -p $out/bin

     

       38
       38
       -
           cp -r bundle/* $out/

     

       39
       39
       -
           patchShebangs $out

     

       40
       40
       -
           ln -s $out/gemini.js $out/bin/qwen

     

       68
       68
       +
           mkdir -p $out/bin $out/share/qwen-code

     

       69
       69
       +
           cp -r bundle/* $out/share/qwen-code/

     

       70
       70
       +
           patchShebangs $out/share/qwen-code

     

       71
       71
       +
           ln -s $out/share/qwen-code/gemini.js $out/bin/qwen

     

       41
       72
        
       

     

       42
       73
        
           runHook postInstall

     

       43
       74
        
         '';