guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 09f59671e82f0f3290a0c932aa70db6cd9e83f7d
Author: Tomas Ortin Fernandez (quanrong) <[email protected]>
AuthorDate: Fri Jul 17 11:36:40 2026 +0200
gnu: gajim: Update to 2.5.0.
* gnu/packages/messaging.scm (gajim): Update to 2.5.0.
[inputs]: Add python-pysequoia.
[native-search-paths]: Update the hardcoded Python version to 3.12.
* gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch: Regenerate.
Signed-off-by: Liliana Marie Prikler <[email protected]>
Merges: guix/guix#10001
---
gnu/packages/messaging.scm | 8 +++----
.../patches/gajim-honour-GAJIM_PLUGIN_PATH.patch | 25 ++++++++++++++--------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index e730880bc9..71dabbc9dd 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1241,7 +1241,7 @@ of xmpppy.")
(define-public gajim
(package
(name "gajim")
- (version "2.4.6")
+ (version "2.5.0")
(source
(origin
(method url-fetch)
@@ -1249,7 +1249,7 @@ of xmpppy.")
(version-major+minor version)
"/gajim-" version ".tar.gz"))
(sha256
- (base32 "0ilpgkzw45scjlnag94p8v6np629v7w0ihci5a2w5d742gpqvq6c"))
+ (base32 "1q7pg604d92v9ra6c6njkvc6mrhpfv65akmax5f6bmk3fhvrfa9l"))
(patches
(search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
(build-system pyproject-build-system)
@@ -1307,7 +1307,6 @@ of xmpppy.")
(list
(search-path-specification
(variable "GAJIM_PLUGIN_PATH")
- (separator #f) ; single entry
(files (list "share/gajim/plugins")))
;; Gajim needs to use the propagated inputs of its plugins.
(search-path-specification
@@ -1319,7 +1318,7 @@ of xmpppy.")
;; FIXME: Cannot use this expression as it would
;; introduce a circular dependency at the top level.
;; (version-major+minor (package-version python))
- "3.11"
+ "3.12"
"/site-packages"))))))
(native-inputs
(list gettext-minimal
@@ -1365,6 +1364,7 @@ of xmpppy.")
python-pycairo
python-pygobject
python-pyopenssl
+ python-pysequoia
python-qrcode
python-sqlalchemy-2
python-truststore))
diff --git a/gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch
b/gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch
index cb3313197c..3ec6559341 100644
--- a/gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch
+++ b/gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch
@@ -1,11 +1,18 @@
---- a/gajim/common/configpaths.py 2020-11-19 12:12:02.004414323 +0100
-+++ a/gajim/common/configpaths.py 2020-11-19 15:34:52.211476895 +0100
-@@ -47,7 +47,7 @@
- return [Path(_paths['PLUGINS_BASE']),
- Path('/app/plugins')]
- return [Path(_paths['PLUGINS_BASE']),
-- Path(_paths['PLUGINS_USER'])]
-+ Path(_paths['PLUGINS_USER'])] +
([Path(os.getenv('GAJIM_PLUGIN_PATH'))] if os.getenv('GAJIM_PLUGIN_PATH') and
Path(os.getenv('GAJIM_PLUGIN_PATH')).is_dir() else [])
+diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py
+index f9076d7..b5b5eed 100644
+--- a/gajim/common/configpaths.py
++++ b/gajim/common/configpaths.py
+@@ -42,7 +42,12 @@ def get_temp_dir() -> Path:
+ def get_plugin_dirs() -> list[Path]:
+ if gajim.IS_FLATPAK:
+ return [Path(_paths["PLUGINS_BASE"]), Path("/app/plugins")]
+- return [Path(_paths["PLUGINS_BASE"]), Path(_paths["PLUGINS_USER"])]
++
++ dirs = [Path(_paths["PLUGINS_BASE"]), Path(_paths["PLUGINS_USER"])]
++ for path in os.getenv("GAJIM_PLUGIN_PATH", "").split(":"):
++ if path and Path(path).is_dir():
++ dirs.append(Path(path))
++ return dirs
- def get_paths(type_: PathType) -> Generator[str, None, None]:
+ def get_ui_path(filename: str) -> Path:
