[PATCH 0/6] gnu: gajim: Update to 1.9.3.

  • Open
  • quality assurance status badge
Details
One participant
  • Morgan Smith
Owner
unassigned
Submitted by
Morgan Smith
Severity
normal
M
M
Morgan Smith wrote on 10 Aug 19:16 +0200
(address . guix-patches@gnu.org)
CH3PR84MB342429F5E2870800CDF63BD9C5BB2@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
[PATCH 1/6] gnu: python-nbxmpp: Update to 5.0.3.
[PATCH 2/6] gnu: Add python-protobuf-5.
[PATCH 3/6] gnu: Add python-omemo-dr.
[PATCH 4/6] gnu: gajim: Update to 1.9.3.
[PATCH 5/6] gnu: Remove gajim-omemo.
[PATCH 6/6] gnu: gajim-openpgp: Update to 1.6.1.
M
M
Morgan Smith wrote on 10 Aug 19:27 +0200
[PATCH 1/6] gnu: python-nbxmpp: Update to 5.0.3.
(address . 72564@debbugs.gnu.org)(name . Morgan Smith)(address . Morgan.J.Smith@outlook.com)
CH3PR84MB3424E74D9FFF870ADA012D9AC5BB2@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
* gnu/packages/messaging.scm (python-nbxmpp): Update to 5.0.3.

Change-Id: Id1c4cb770123e9ed4a7fa846107eb38df412bc10
---
gnu/packages/messaging.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index da04c34636..c2089260da 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1146,13 +1146,13 @@ (define-public znc
(define-public python-nbxmpp
(package
(name "python-nbxmpp")
- (version "4.2.2")
+ (version "5.0.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "nbxmpp" version))
(sha256
- (base32 "095nyy6vjildhrqigxk6vsh49in6mx17bvb3z5zpjmzhv9b8ix46"))))
+ (base32 "1swzbdl1zr34jynhsm1f401h5hdn9p6vw9vxa7vx0gd3ifkmiz7w"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -1162,7 +1162,6 @@ (define-public python-nbxmpp
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests? (invoke "python" "-m" "unittest" "-v")))))))
- (native-inputs (list `(,glib "bin")))
(inputs
(list glib
glib-networking
--
2.45.2
M
M
Morgan Smith wrote on 10 Aug 19:27 +0200
[PATCH 3/6] gnu: Add python-omemo-dr.
(address . 72564@debbugs.gnu.org)(name . Morgan Smith)(address . Morgan.J.Smith@outlook.com)
CH3PR84MB342490286C2CA170D814CC0FC5BB2@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
* gnu/packages/python-crypto.scm (python-omemo-dr): New variable.

Change-Id: I06b31e62dff1a740fee832e17200f8905810860a
---
gnu/packages/python-crypto.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)

Toggle diff (34 lines)
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 86a826b7ed..0da6ff49f6 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -758,6 +758,27 @@ (define-public python-axolotl
asynchronous messaging environments.")
(license license:gpl3)))
+(define-public python-omemo-dr
+ (package
+ (name "python-omemo-dr")
+ (version "1.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://dev.gajim.org/gajim/omemo-dr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1gx0znbfvs8jg9s754hha81l8wpghswkfsqx2jzpgv6gigf3sm8z"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ (list python-axolotl-curve25519 python-cryptography python-protobuf-5))
+ (home-page "https://dev.gajim.org/gajim/omemo-dr")
+ (synopsis "OMEMO cryptography library")
+ (description "OMEMO cryptography library that was forked from python-axolotl.")
+ (license license:gpl3)))
(define-public python-pyaes
(package
--
2.45.2
M
M
Morgan Smith wrote on 10 Aug 19:27 +0200
[PATCH 4/6] gnu: gajim: Update to 1.9.3.
(address . 72564@debbugs.gnu.org)(name . Morgan Smith)(address . Morgan.J.Smith@outlook.com)
CH3PR84MB3424246ED356AFD7ADF2CC77C5BB2@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
* gnu/packages/messaging.scm (gajim): Update to 1.9.3.

Change-Id: I302a02e6ea9c0f974055a5f44f06c61bcf2fb93e
---
gnu/packages/messaging.scm | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)

Toggle diff (94 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c2089260da..657da86c10 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1180,7 +1180,7 @@ (define-public python-nbxmpp
(define-public gajim
(package
(name "gajim")
- (version "1.7.3")
+ (version "1.9.3")
(source
(origin
(method url-fetch)
@@ -1188,7 +1188,7 @@ (define-public gajim
(version-major+minor version)
"/gajim-" version ".tar.gz"))
(sha256
- (base32 "066kvkjw3qcdanr3nczy0wgcwihk9jc9zhzfr5bwlqvcyxcv7k5p"))
+ (base32 "10rz8pd43a9308kj6csixsmvdc6ccnqkw83adc5cggh1798b45ag"))
(patches
(search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
(build-system python-build-system)
@@ -1226,14 +1226,15 @@ (define-public gajim
(invoke "./pep517build/install_metadata.py" "dist/metadata"
(string-append "--prefix=" #$output))))
(replace 'check
- (lambda _
- ;; Tests require a running X server.
- (system "Xvfb :1 +extension GLX &")
- (setenv "DISPLAY" ":1")
- ;; For missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- (invoke "dbus-launch" "python" "-m" "unittest"
- "discover" "-s" "test")))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; Tests require a running X server.
+ (system "Xvfb :1 +extension GLX &")
+ (setenv "DISPLAY" ":1")
+ ;; For missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ (invoke "dbus-launch" "python" "-m" "unittest"
+ "discover" "-s" "test"))))
(add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases
'glib-or-gtk-compile-schemas))
@@ -1273,15 +1274,14 @@ (define-public gajim
"/site-packages"))))))
(native-inputs
(list gettext-minimal
- `(,glib "bin")
gobject-introspection
- `(,gtk+ "bin")
python-distutils-extra
python-pypa-build
python-setuptools
xorg-server-for-tests))
(inputs
(list avahi
+ bash-minimal
dbus
farstream
geoclue
@@ -1297,22 +1297,27 @@ (define-public gajim
gupnp-igd
libappindicator
libnice
+ libomemo
libsecret
libsoup
libxscrnsaver
network-manager
python-css-parser
python-dbus
+ python-emoji
python-gssapi
python-idna
python-keyring
python-nbxmpp
+ python-omemo-dr
python-packaging
python-pillow
python-precis-i18n
python-pycairo
python-pygobject
- python-pyopenssl))
+ python-pyopenssl
+ python-qrcode
+ python-sqlalchemy-2))
(propagated-inputs
(list dconf))
(synopsis "Fully-featured XMPP client")
--
2.45.2
M
M
Morgan Smith wrote on 10 Aug 19:27 +0200
[PATCH 5/6] gnu: Remove gajim-omemo.
(address . 72564@debbugs.gnu.org)(name . Morgan Smith)(address . Morgan.J.Smith@outlook.com)
CH3PR84MB3424189C12A6F62C5690491DC5BB2@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
This plugin is no longer needed. The functionality is build into gajim now.

* gnu/packages/messaging.scm (gajim-omemo): Delete variable.

Change-Id: Ib2e76eab9ace8486396f6dab590b830866693d87
---
gnu/packages/messaging.scm | 36 ------------------------------------
1 file changed, 36 deletions(-)

Toggle diff (49 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 657da86c10..4102737ff1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1327,42 +1327,6 @@ (define-public gajim
(home-page "https://gajim.org/")
(license license:gpl3)))
-(define-public gajim-omemo
- (package
- (name "gajim-omemo")
- (version "2.9.0")
- (source
- (origin
- (method url-fetch/zipbomb)
- (uri
- (string-append
- "https://ftp.gajim.org/plugins/master/omemo/omemo_"
- version ".zip"))
- (sha256
- (base32 "0yy9r9fsrlgdywiln8bskhi8faj9hnz7b19jcap5nkhv8jn9cqq7"))))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let* ((out (assoc-ref %outputs "out"))
- (share (in-vicinity out "share/gajim/plugins/omemo"))
- (source (assoc-ref %build-inputs "source")))
- (mkdir-p share)
- (copy-recursively source share)
- #t))))
- (propagated-inputs
- (list python-axolotl python-axolotl-curve25519 python-cryptography
- python-qrcode))
- (synopsis "Gajim OMEMO plugin")
- (description "Gajim-OMEMO is a plugin that adds support for the OMEMO
-Encryption to Gajim. OMEMO is an XMPP Extension Protocol (XEP) for secure
-multi-client end-to-end encryption.")
- (home-page
- "https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OmemoGajimPlugin")
- (license license:gpl3+)))
-
(define-public gajim-openpgp
(package
(name "gajim-openpgp")
--
2.45.2
M
M
Morgan Smith wrote on 10 Aug 19:27 +0200
[PATCH 6/6] gnu: gajim-openpgp: Update to 1.6.1.
(address . 72564@debbugs.gnu.org)(name . Morgan Smith)(address . Morgan.J.Smith@outlook.com)
CH3PR84MB3424B1490219F2C66872CB6DC5BB2@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
* gnu/packages/messaging.scm (gajim-openpgp): Update to 1.6.1.

Change-Id: Iab263d7905b869895889a70c1a3c13d71bae1e51
---
gnu/packages/messaging.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4102737ff1..07e34a8f91 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1330,7 +1330,7 @@ (define-public gajim
(define-public gajim-openpgp
(package
(name "gajim-openpgp")
- (version "1.5.0")
+ (version "1.6.1")
(source
(origin
(method url-fetch/zipbomb)
@@ -1339,7 +1339,7 @@ (define-public gajim-openpgp
"https://ftp.gajim.org/plugins/master/openpgp/openpgp_"
version ".zip"))
(sha256
- (base32 "193pbh9iri7bkamvjwp236i8g5zxxiqgsv64kll5sy76vx4q73c4"))))
+ (base32 "0m1g5wajpc3kfz5jv8y3i9xy1nqhq15ripv49lgsq7j1f0a3w3wh"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
--
2.45.2
M
M
Morgan Smith wrote on 10 Aug 19:27 +0200
[PATCH 2/6] gnu: Add python-protobuf-5.
(address . 72564@debbugs.gnu.org)(name . Morgan Smith)(address . Morgan.J.Smith@outlook.com)
CH3PR84MB3424BEAD5F7CA4A934C15A68C5BB2@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
* gnu/packages/protobuf.scm (python-protobuf-5): New variable.

Change-Id: Ic181a92bc0e3eb66adf535d98b192cbb006028ad
---
gnu/packages/protobuf.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)

Toggle diff (46 lines)
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index d47b67fa61..f1a3259709 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -426,6 +426,39 @@ (define-public python-nanopb
(propagated-inputs (list python-protobuf))
(synopsis "Small code-size Protocol Buffers implementation in Python")))
+(define-public python-protobuf-5
+ (package
+ (name "python-protobuf")
+ (version "5.27.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "protobuf" version))
+ (sha256
+ (base32
+ "0b6qxb6hnhzmiz1wnjrjdmwxx2ddv9zr86p89vivgwj0wq1hjil2"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ;; FIXME: ImportError: 'testing_refleaks' module incorrectly imported from
+ ;; '/gnu/store/...-python-protobuf-5.27.3/lib/python3.10/site-packages/google/protobuf/internal'.
+ ;; Expected '/tmp/guix-build-python-protobuf-5.27.3.drv-0/protobuf-5.27.3/google/protobuf/internal'.
+ ;; Is this module globally installed?
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "python" "-m" "unittest" )))))))
+ (inputs (list protobuf))
+ (home-page "https://github.com/protocolbuffers/protobuf")
+ (synopsis "Protocol buffers is a data interchange format")
+ (description
+ "Protocol buffers are a language-neutral, platform-neutral extensible
+mechanism for serializing structured data.")
+ (license license:bsd-3)))
+
(define-public python-protobuf
(package
(name "python-protobuf")
--
2.45.2
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 72564@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 72564
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch