Merge pull request #48 from FrancescoCaracciolo/master

Fix curl_cffi dependency missing
qwersyk · Aug 3, 2024 · 90cc4c2 · 90cc4c2
2 parents 6db21bb + f65e1f8
commit 90cc4c2
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/io.github.qwersyk.Newelle.json b/io.github.qwersyk.Newelle.json
@@ -28,8 +28,9 @@
     "modules" : [
     	"python3-requests.json",
     	"python3-expandvars.json",
-    	"python3-gpt4all.json",
+    	"python3-curl_cffi.json",
 	"python3-g4f.json",
+    	"python3-gpt4all.json",
     	"python3-gtts.json",
     	"python3-playsound.json",
     	"python3-pip.json",

diff --git a/python3-curl_cffi.json b/python3-curl_cffi.json
@@ -0,0 +1,31 @@
+{
+    "name": "python3-curl_cffi",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"curl_cffi\" --no-build-isolation"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/25/25/56cbb1fc9cff46999a11ccb75dab1ee62be629d6e871142c37d26ed460d7/curl_cffi-0.7.1-cp38-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
+            "sha256": "1e53ab76259b575017d3260854456ba6a3fbe31cee9b44edd275d4ea9f0f20e1",
+            "only-arches": ["x86_64"]
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/ae/61/8015cfcfdd7487f2cfeca90a18fd5504d29192b4700af93494d6915f508d/curl_cffi-0.7.1-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl",
+            "sha256": "99a5cc1d9ca59692cc5c175da0b397104283a0fea7515045fd22a7296296d82b",
+            "only-arches": ["aarch64"]
+        },
+	{
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/68/ce/95b0bae7968c65473e1298efb042e10cafc7bafc14d9e4f154008241c91d/cffi-1.16.0.tar.gz",
+            "sha256": "bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/62/d5/5f610ebe421e85889f2e55e33b7f9a6795bd982198517d912eb1c76e1a53/pycparser-2.21-py2.py3-none-any.whl",
+            "sha256": "8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"
+        }
+    ]
+}
diff --git a/python3-g4f.json b/python3-g4f.json
@@ -2,7 +2,7 @@
     "name": "python3-g4f",
     "buildsystem": "simple",
     "build-commands": [
-        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"g4f\" --no-build-isolation"
+        "pip install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"g4f\" --no-build-isolation"
     ],
     "sources": [
         {
@@ -12,8 +12,8 @@
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/07/b1/d9455cf313df7b2fe6c60a871eb96801b6e8fbdc7d736f6576492b4c97b3/aiohappyeyeballs-2.3.2-py3-none-any.whl",
-            "sha256": "903282fb08c8cfb3de356fd546b263248a477c99cb147e20a115e14ab942a4ae"
+            "url": "https://files.pythonhosted.org/packages/93/fd/a19345071360a94345ebecaa268d6c6f56900687d91ef775fe2496a76100/aiohappyeyeballs-2.3.4-py3-none-any.whl",
+            "sha256": "40a16ceffcf1fc9e142fd488123b2e218abc4188cf12ac20c67200e1579baa42"
         },
         {
             "type": "file",
@@ -47,8 +47,8 @@
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/78/93/c2a8f27e1372fcb340936f0fe5bc4988cb1ed11bcdcd3e34ca06a48ea9bb/g4f-0.3.2.2-py3-none-any.whl",
-            "sha256": "35fbfcc6d220520c1dea48f1a3f18d29c3839ff73cb55170446905249fe07944"
+            "url": "https://files.pythonhosted.org/packages/b9/f0/10a6f55f08833aac26c879ef5e0d2d3f4a26da47eea5d3f26de0ed4c37b1/g4f-0.3.2.3-py3-none-any.whl",
+            "sha256": "3cfb012290e455ba4eea240e9fe49162e4851b2155661be5e9065c76cbc6bd7b"
         },
         {
             "type": "file",