From patchwork Wed Nov 14 19:55:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 201 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 74CA11680A; Wed, 14 Nov 2018 20:00:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 26E09167BD for ; Wed, 14 Nov 2018 20:00:10 +0000 (GMT) Received: from localhost ([::1]:33951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN1Kb-0005AD-ES for patchwork@mira.cbaines.net; Wed, 14 Nov 2018 15:00:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN1Hd-00035N-20 for guix-patches@gnu.org; Wed, 14 Nov 2018 14:57:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN1Ha-0001aI-Bs for guix-patches@gnu.org; Wed, 14 Nov 2018 14:57:04 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN1Ha-0001Zz-8I for guix-patches@gnu.org; Wed, 14 Nov 2018 14:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gN1HZ-00032o-Tm for guix-patches@gnu.org; Wed, 14 Nov 2018 14:57:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33386] [PATCH 1/2] gnu: gajim: Add support for Guix packaged plugins. References: <87d0r7e8ox.fsf@lassieur.org> In-Reply-To: <87d0r7e8ox.fsf@lassieur.org> Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Nov 2018 19:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33386 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33386@debbugs.gnu.org Received: via spool by 33386-submit@debbugs.gnu.org id=B33386.154222536711628 (code B ref 33386); Wed, 14 Nov 2018 19:57:01 +0000 Received: (at 33386) by debbugs.gnu.org; 14 Nov 2018 19:56:07 +0000 Received: from localhost ([127.0.0.1]:52594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN1Gh-00031Q-AF for submit@debbugs.gnu.org; Wed, 14 Nov 2018 14:56:07 -0500 Received: from mail.lassieur.org ([83.152.10.219]:40108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN1Gg-00031H-4q for 33386@debbugs.gnu.org; Wed, 14 Nov 2018 14:56:06 -0500 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 8d6e57d2 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <33386@debbugs.gnu.org>; Wed, 14 Nov 2018 19:56:04 +0000 (UTC) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Wed, 14 Nov 2018 20:55:52 +0100 Message-Id: <20181114195553.27293-1-clement@lassieur.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/messaging.scm (gajim)[arguments]: Add an 'add-plugin-dirs' phase. Export PYTHONPATH in the wrapper. [inputs]: Remove python-axolotl and python-qrcode. --- gnu/packages/messaging.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c22cacfd3..f68b7e4eb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -588,15 +588,29 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") `(#:test-target "test_nogui" #:phases (modify-phases %standard-phases + (add-after 'unpack 'add-plugin-dirs + (lambda _ + (substitute* "gajim/common/configpaths.py" + (("_paths\\['PLUGINS_USER'\\]") + (string-append + "_paths['PLUGINS_USER'],os.path.expanduser" + "('~/.guix-profile/share/gajim/plugins')"))) + #t)) (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (for-each (lambda (name) (let ((file (string-append out "/bin/" name)) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (pythonpath (string-append + "$HOME/.guix-profile/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) (wrap-program file - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("PYTHONPATH" ":" prefix (,pythonpath))))) '("gajim" "gajim-remote" "gajim-history-manager"))) #t)) (add-after 'install 'install-icons @@ -636,7 +650,6 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ("gtkspell3" ,gtkspell3) ("hicolor-icon-theme" ,hicolor-icon-theme) ("libsecret" ,libsecret) - ("python-axolotl" ,python-axolotl) ("python-cssutils" ,python-cssutils) ("python-dbus" ,python-dbus) ("python-gnupg" ,python-gnupg) @@ -646,8 +659,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ("python-precis-i18n" ,python-precis-i18n) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) - ("python-pyopenssl" ,python-pyopenssl) - ("python-qrcode" ,python-qrcode))) + ("python-pyopenssl" ,python-pyopenssl))) (home-page "https://gajim.org/") (synopsis "Jabber (XMPP) client") (description "Gajim is a feature-rich and easy to use Jabber/XMPP client. From patchwork Wed Nov 14 19:55:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 200 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4D0A11680A; Wed, 14 Nov 2018 19:57:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id EB11B167BD for ; Wed, 14 Nov 2018 19:57:11 +0000 (GMT) Received: from localhost ([::1]:33936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN1Hj-000377-1b for patchwork@mira.cbaines.net; Wed, 14 Nov 2018 14:57:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN1Hd-00035M-25 for guix-patches@gnu.org; Wed, 14 Nov 2018 14:57:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN1Ha-0001ad-IB for guix-patches@gnu.org; Wed, 14 Nov 2018 14:57:04 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN1Ha-0001aR-Eo for guix-patches@gnu.org; Wed, 14 Nov 2018 14:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gN1Ha-00032v-D8 for guix-patches@gnu.org; Wed, 14 Nov 2018 14:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33386] [PATCH 2/2] gnu: Add gajim-omemo. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Nov 2018 19:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33386 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33386@debbugs.gnu.org Received: via spool by 33386-submit@debbugs.gnu.org id=B33386.154222536911637 (code B ref 33386); Wed, 14 Nov 2018 19:57:02 +0000 Received: (at 33386) by debbugs.gnu.org; 14 Nov 2018 19:56:09 +0000 Received: from localhost ([127.0.0.1]:52596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN1Gj-00031d-Jk for submit@debbugs.gnu.org; Wed, 14 Nov 2018 14:56:09 -0500 Received: from mail.lassieur.org ([83.152.10.219]:40108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN1Gg-00031H-SC for 33386@debbugs.gnu.org; Wed, 14 Nov 2018 14:56:07 -0500 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 5007ebf3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <33386@debbugs.gnu.org>; Wed, 14 Nov 2018 19:56:04 +0000 (UTC) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Wed, 14 Nov 2018 20:55:53 +0100 Message-Id: <20181114195553.27293-2-clement@lassieur.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114195553.27293-1-clement@lassieur.org> References: <20181114195553.27293-1-clement@lassieur.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/messaging.scm (gajim-omemo): New variable. [propagated-inputs]: Add python-axolotl and python-qrcode. --- gnu/packages/messaging.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f68b7e4eb..7be0fcc1b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -93,6 +93,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -669,6 +670,42 @@ transformation; audio and video conferences; file transfer; TLS, GPG and end-to-end encryption support; XML console.") (license license:gpl3))) +(define-public gajim-omemo + (package + (name "gajim-omemo") + (version "2.6.23") + (source (origin + (method url-fetch/zipbomb) + (uri (string-append + "https://ftp.gajim.org/plugins_releases/omemo_" + version ".zip")) + (sha256 + (base32 + "134zbscbcnhx4smad0ryvx3ngkqlsspafqf0kk8y2d3vcd9bf3pa")))) + (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")) + (source (assoc-ref %build-inputs "source"))) + (mkdir-p share) + (copy-recursively source share) + #t)))) + (propagated-inputs + `(("python-axolotl" ,python-axolotl) + ("python-qrcode" ,python-qrcode))) + (home-page + "https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin") + (synopsis "Gajim OMEMO plugin") + (description + "This package provides the Gajim OMEMO plugin. OMEMO is an XMPP +Extension Protocol (XEP) for secure multi-client end-to-end encryption based +on Axolotl and PEP.") + (license license:gpl3+))) + (define-public dino ;; The only release tarball is for version 0.0, but it is very old and fails ;; to build.