Christopher Baines <mail@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at 64021) by debbugs.gnu.org; 20 Jun 2023 21:46:44 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 20 17:46:44 2023 Received: from localhost ([127.0.0.1]:60047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qBjBT-0000Bi-MZ for submit <at> debbugs.gnu.org; Tue, 20 Jun 2023 17:46:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1qBjBR-0000BH-F9 for 64021 <at> debbugs.gnu.org; Tue, 20 Jun 2023 17:46:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1qBjBL-0005Gz-W3; Tue, 20 Jun 2023 17:46:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=rP4rEK+ayPN5lE0oLetKiyqxjbxXOhSdjAwnqmS/xec=; b=buUJGm7na2xKMvcgRyPV 3GfGwlKJ/Ert8AN4gK929CiW9DSAFAr+iG+EUnkFZ1raEjnGH5V3dfw2i2mQiNiMCS0Us1O+2Py3k BxEdZyr06mzORKDRZe74FQzFALh5dkQJEnWFkJr1VvoRxG5bJH7JinZAesMwHnj6QAB1qfmabd7iE rMs85VyALAVAtNGK5KdfBpzJ3W/m19sqAObonbCUx9FWbzZyyIWXWZb6zH/wsK9m/0896ZYSxn5og AWuPvSbqBi5YQ/aYWaDLJydenR+cW4PbThbJT1KD8rO2t2IyltpiczerL0jwqf2i5uHt6xleAxlyW 5BWfMuspAkW5EQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1qBjBL-0003xP-Iu; Tue, 20 Jun 2023 17:46:35 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Parnikkapore <poomklao@HIDDEN> Subject: Re: bug#64021: [PATCH] gnu: gajim: Update to 1.7.3. References: <d843f47ac84e5578ba9ed9f441c59ed83a448a4d.1686581089.git.poomklao.ref@HIDDEN> <d843f47ac84e5578ba9ed9f441c59ed83a448a4d.1686581089.git.poomklao@HIDDEN> Date: Tue, 20 Jun 2023 23:46:33 +0200 In-Reply-To: <d843f47ac84e5578ba9ed9f441c59ed83a448a4d.1686581089.git.poomklao@HIDDEN> (Parnikkapore's message of "Mon, 12 Jun 2023 22:50:41 +0800") Message-ID: <875y7hbydi.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64021 Cc: 64021 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi Parnikkapore, Parnikkapore <poomklao@HIDDEN> skribis: > * gnu/packages/messaging.scm (python-nbxmpp): Update to 4.2.2. > [arguments]: Specify "python -m unittest" as test method, > [inputs]: Move python dependencies to propagated-inputs. > [propagated-inputs]: Likewise. > * gnu/packages/messaging.scm (gajim): Update to 1.7.3. > [arguments]: Switch to "python -m build". > To use pyproject-build-system, support for backend-path is needed. > [arguments]: Add metadata build and install phase. > [arguments]: Switch to "python -m unittest" as test method, > following upstream recommendation. > [arguments]: Generate gdk-pixbuf cache and include result in wrapper. > Allows Gajim to run in pure environments. > [native-search-paths]: Update. > * gnu/packages/messaging.scm (gajim-omemo): Update to 2.9.0. > * gnu/packages/messaging.scm (gajim-openpgp): Update to 1.5.0. > --- > > Here's a resend of https://issues.guix.gnu.org/63494 which is rebased > on top of current master. https://issues.guix.gnu.org/63594 is already > included. > > I have gotten Gajim 1.8 working in Guix (see https://codeberg.org/Parnikk= apore/guix-ngapsh-unsigned/src/commit/cc3069a118995e98ff971d51d36689ea6ceef= 366/pnkp/guix/packages/messaging.scm); > however, it requires python-protobuf >=3D4.21.0, which is not yet > packaged to Guix standards. > > Again, sorry for consolidating the changes (and for `guix style`-ing pyth= on-nbxmpp)! This is great and it passes according to <https://qa.guix.gnu.org/issue/64021>. However, for clarity, could you please resubmit it with one change by patch=E2=80=94that is, one patch for python-nbxmpp, one for gajim, one for the gajim-omemo, etc.? Sorry for asking for extra work but that=E2=80=99s an important part of simplifying review as well as bisecting! Thanks, Ludo=E2=80=99.
guix-patches@HIDDEN
:bug#64021
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 12 Jun 2023 14:51:12 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jun 12 10:51:12 2023 Received: from localhost ([127.0.0.1]:40117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1q8isx-0005fe-To for submit <at> debbugs.gnu.org; Mon, 12 Jun 2023 10:51:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:48864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <poomklao@HIDDEN>) id 1q8ist-0005fU-Ti for submit <at> debbugs.gnu.org; Mon, 12 Jun 2023 10:51:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <poomklao@HIDDEN>) id 1q8ist-00057d-DZ for guix-patches@HIDDEN; Mon, 12 Jun 2023 10:51:07 -0400 Received: from sonic306-20.consmr.mail.sg3.yahoo.com ([106.10.241.140]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <poomklao@HIDDEN>) id 1q8iso-0004ih-5S for guix-patches@HIDDEN; Mon, 12 Jun 2023 10:51:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1686581456; bh=bFLDCyM51h3gZH+QHYK6B8K/KmjMIjVYm7AatnS4PO0=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=SKD/W7puPQuqFSgn+9+Nnp9FNCG4na57LHFNO+J8shYE09upUNcibcynmHprVGejwwPfKW2d4q44VITrZrHmVU2HGvrqLqfyAx6D6wjoK+PNWk+a+Ywl11nqJtF4MpyFj3vgjhg2TU1gFgpsrB+JjXYgSsRUykOF680Z/yjJSauBXh9dUYofgazK5FsOlyzM3bXQZ7XytVpDXHNmAx3TKG9aiSRVlyI+iRpbqUyhyckEKVjX42vLBN1fHpVYzrlhhsDlB34AgBCoqNuauoKaVGaLWoM2HX/yEJUExeRPqxGBmAUFPrmKtFcjvbo0rf1g7QjrsA1MI2jAoi6oJ8cLKA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1686581456; bh=N0WMVXEm5DLNiDkEoFmWJMlc/09QL8rDoQbSXa89URX=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=BLPdFpKkg/9BmwYw94Qc3CKEdaAFdAlNL2QYHa2yOSgFEwpig7HzEsAIJ0PDf7AOqo83/QxBCDHTD0McAqQ+yeVZ+NdhThxj+HR4DnJjETEtiV5sK8UMajal3mFMz5JmMGWliTOOLNFK4yw32kdRnXHrHFU8/f3EHka+v8t3PR+ifGKhNZ0KbPmha2Xy+17A9eAYX8THyzPTNZFrhuiBFWcZLZua9N6GpyYsRguUy6snwIPDrmC5x85RiFmn+fjpDK9zOqpLt3DilIW9eBUx3JX154tquWfG8Memb6FmiOfK+hctiXUBKzHLLb8seq1zlJp3yAlcIqS6AO5iXJ/Vdg== X-YMail-OSG: bbvP1mEVM1lb4_1aRNCkkXPUKkGLasNHVIGszflAfWNszOrp0KsD8O29noyPC5e tMseS87QtqCIakp1cKrsHp21emCDiRYEBaX6tptwydrbI.vbIuUyEdYKqNsj4RLbcwvqEAbxsuoE a78tmNciXT4lbFmYdNctuBzrgop6SQNdns5bfk2yIAOwAZiSGdpJ.G6JQPdFTxF.xlE1EKjt2zjh XBwEJwklgT9OZgaBe1xewcf0srQKXm_9oKIDiF2rFbfKyJF_UP3OvwhRoNHoSTsPjfxEVQeLdqmf P4a.vui6izfEPFJaqpuzFgCaElsCeovlyOKdesz6j6sBtdxYVHwyq.6nwt3cjpaDtD5vEGhIBxl6 M2yAIXpoPtGWcJyWkkY1ouBb_3k262W5YJLqQ0bVihF3ooIhcof253sX26B1RYu.OWeJjkniAlfe YLNgou9VY.YN38MLkX6BUuBvsGz2w.NRgi27C8x4nr3R2DF8yK3U1nOe77KBa.uOmoDOOCjsBsh1 ycUd21.zk.flvuPkhVXTq1HGx1tpSWzaF6pFGtR6lzRFmHt864teHb9oS8E_Av19xq_2DNdSQabb 8BxP.Qe.VrzeVHJ2s7GPJOWd48xEBDIHrvAyp2WRe5ZyXQj7jkYjSGija6mvvl58yRanDwutPxjF N6ddmdv9HibAG6gtbtexCN5WscwsR0Roj_QTFMt_8S2F7kWMFj15I_ti5.KfZk1W_pq5ukkoM.i9 1UrXkGFC2YwaTGP9bB86MhhJfVhX5xKY6_oDPB6nTNuDdxggkHiyXnKyzI_xB_0QpwS6sPqDMJFy yCMEA_1XZd1wbZn6uT9Uodl589wxZJ1hLuxliRjIZy4NjidzbUblWay5bJirZX5iXDUtlZ2kxFY. Y1IsMs0Ey9n5IrJ5Drf_hqg1RNa7_85xmb7LCXqlyKCSZluafzQYCMFGG9OEYKMPpz3M0vmq7em2 TxPURuPVOYfktPyB_V0pmmvqX.e4qdAXYdvyAnaU9nh1XujqXhOqlwBEWfwYqxfdVymZVKeWxFtf eK19bS..enaA9y0ECI0cmzC6RlUX1gMcZSIdEwEXF.CEj2u3HyCbYdajFxhxsRwyOnrCp7KE2Z5n rUUJBXVC.HT3MG80yNd4_UIU6SiISl8nyBU32x0.._5i.UuJG.IMOeVpJ13q7K9S6ERC_C4BFuzp nqIckueqosa9Lq7JzCpSos8mpyYsFP98x_eWSxI7gs9Aqh5dly2O0ctrTdl38uvhwSfFVnxKbmF_ B7KL6yBexB635FnG..jW6vN7w9tasq2NsEsJgRbGSsiyDJUJioPh163_AzwlgOHpJSvxvAQHHVW7 ZPV0WyZ2aZSYJNRSWzhK5UWklJHL03YgeKjSze2AEYRaiucdg8YfuEzTUmQzCoOIAxZui6baBBui Ne.IXsh9Znsfml8S3SLZKF5yKFR7eo5pBgzSYpEz8599PMRde35tz5t3zEZEeC9tqC7mOOpyLJ5L _aw2GukER_8Yn6xDGNO1NAfBs50mBPkACuu5fzKe94QNVnliuYNR5ttuUTMpAufX3HjX.fnhcCM6 e4dW95nI.Dpwl2Buiegcn9cNg4Pta6.2TULDlvm8EXaKst92MCrig9UFTuH.Dox0VbFrJ0N5dVYF fPUJvLWdjYL9xxfvO1A6xkgFwbJDzs8cl4MJzPmlq7.o4cfQnoi.DPDQB57hvCPu8oGBvZnUqC9x T3i.PZ5OdWwl4BkjWHWY9dmBEdmsX9IBnFTNk8hdfErkS4kf4AMnSml3Q0bielnPUY77WDcaqRGv LJWK6R5ZEXpiDLcBfxRdDSwf8bsRzjQZdRq8s1BPBaEWgmHxS4ZcP1XUlmS1zNJVkYep6g9U3_qn 7vvIJyEVRR0nJdtT5csESWch1Y6qBZwwcCLvHhqozav2y1hXigpe9opJPy2.VmNt6VjM4F6iqxTy G.RsNy93zH38a6TIh5ITG1b1T70WR5bOWN_omiDzhTJTp7rAjYJ8OhNl4_Ztow3RS7ZfEnbhz_An xiN2dS9cKP6MNSGoJZo7L.ZoRGiAdwjSw.PwC9nurqDauJON6U2H_.zTmQRFxfLieTrfIMxPlz7U AzvoTciCGfMj522AFmbf7udAqAquDiFOPO9v0ZYWIy0j58N.rXMLFm7Jsz_UYwaHKIBp5UUcJtH3 peMLQPD._BTkSPciCg6Hl6LZ2o91IzRy33K4Npc2OB_smhl1LXEelLV8Jld4pYUC.koMv0Ax4HdG srhnTf6jOKRmZFrxj_KOFn.G1mvBf6tbWmLApOw-- X-Sonic-MF: <poomklao@HIDDEN> X-Sonic-ID: 822aa3ba-db4e-4438-9096-30087b3c97d5 Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.sg3.yahoo.com with HTTP; Mon, 12 Jun 2023 14:50:56 +0000 Received: by hermes--production-ir2-7867f454fc-57lbs (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID e775dbe00dab04d83c5b5935b33b3e82; Mon, 12 Jun 2023 14:50:50 +0000 (UTC) From: Parnikkapore <poomklao@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] gnu: gajim: Update to 1.7.3. Date: Mon, 12 Jun 2023 22:50:41 +0800 Message-Id: <d843f47ac84e5578ba9ed9f441c59ed83a448a4d.1686581089.git.poomklao@HIDDEN> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit References: <d843f47ac84e5578ba9ed9f441c59ed83a448a4d.1686581089.git.poomklao.ref@HIDDEN> Content-Length: 11162 Received-SPF: pass client-ip=106.10.241.140; envelope-from=poomklao@HIDDEN; helo=sonic306-20.consmr.mail.sg3.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.6 (-) * gnu/packages/messaging.scm (python-nbxmpp): Update to 4.2.2. [arguments]: Specify "python -m unittest" as test method, [inputs]: Move python dependencies to propagated-inputs. [propagated-inputs]: Likewise. * gnu/packages/messaging.scm (gajim): Update to 1.7.3. [arguments]: Switch to "python -m build". To use pyproject-build-system, support for backend-path is needed. [arguments]: Add metadata build and install phase. [arguments]: Switch to "python -m unittest" as test method, following upstream recommendation. [arguments]: Generate gdk-pixbuf cache and include result in wrapper. Allows Gajim to run in pure environments. [native-search-paths]: Update. * gnu/packages/messaging.scm (gajim-omemo): Update to 2.9.0. * gnu/packages/messaging.scm (gajim-openpgp): Update to 1.5.0. --- Here's a resend of https://issues.guix.gnu.org/63494 which is rebased on top of current master. https://issues.guix.gnu.org/63594 is already included. I have gotten Gajim 1.8 working in Guix (see https://codeberg.org/Parnikkapore/guix-ngapsh-unsigned/src/commit/cc3069a118995e98ff971d51d36689ea6ceef366/pnkp/guix/packages/messaging.scm); however, it requires python-protobuf >=4.21.0, which is not yet packaged to Guix standards. Again, sorry for consolidating the changes (and for `guix style`-ing python-nbxmpp)! gnu/packages/messaging.scm | 127 +++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 55 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 00897ea451..58a3eaaf22 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -148,6 +148,7 @@ (define-module (gnu packages messaging) #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -1088,27 +1089,34 @@ (define-public znc (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "3.1.0") - (source - (origin - (method url-fetch) - (uri - (pypi-uri "nbxmpp" version)) - (sha256 - (base32 "0c32090gr1fiy7hkn73dcj4ad9gfdpks8hivl1dl8bql01jsfdnj")))) - (build-system python-build-system) - (native-inputs - (list `(,glib "bin"))) - (inputs - (list glib - glib-networking - libsoup-minimal-2 - python-gssapi - python-idna - python-precis-i18n - python-pygobject)) + (version "4.2.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "nbxmpp" version)) + (sha256 + (base32 + "095nyy6vjildhrqigxk6vsh49in6mx17bvb3z5zpjmzhv9b8ix46")))) + (build-system pyproject-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + ;; XXX: This probably should be an option for pyproject-build-system + (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 + libsoup-minimal)) + (propagated-inputs (list + python-gssapi + python-idna + python-packaging + python-precis-i18n + python-pygobject)) (synopsis "Non-blocking XMPP Module") - (description "Python-nbxmpp is a Python library that provides a way for + (description + "Python-nbxmpp is a Python library that provides a way for Python applications to use the XMPP network. This library was initially a fork of xmpppy.") (home-page "https://dev.gajim.org/gajim/python-nbxmpp") @@ -1117,7 +1125,7 @@ (define-public python-nbxmpp (define-public gajim (package (name "gajim") - (version "1.4.7") + (version "1.7.3") (source (origin (method url-fetch) @@ -1126,7 +1134,7 @@ (define-public gajim (version-major+minor version) "/gajim-" version ".tar.gz")) (sha256 - (base32 "1ww46qlxr14nq0ka8wsf8qpn5qfi5dvgyksfh9411crl7azhfj0s")) + (base32 "066kvkjw3qcdanr3nczy0wgcwihk9jc9zhzfr5bwlqvcyxcv7k5p")) (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) (build-system python-build-system) (arguments @@ -1139,13 +1147,27 @@ (define-public gajim #:prefix glib-or-gtk:) (guix build utils)) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests + ,#~(modify-phases %standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) + (add-before 'build 'build-metadata + (lambda _ + (invoke "./pep517build/build_metadata.py" "-o" "dist/metadata"))) + ;; TODO: Change to pyproject-build-system once it supports + ;; in-tree build backends. + (replace 'build (lambda _ - ;; XXX Gajim builds fine on some (my) machines but fails elsewhere: - ;; ModuleNotFoundError: No module named 'gajim.gui.emoji_data' - ;; https://dev.gajim.org/gajim/gajim/-/issues/11041 - (delete-file "test/no_gui/test_styling.py"))) + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda _ + (apply invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output + (find-files "dist" "\\.whl$")))) + (add-after 'install 'install-metadata + (lambda _ + (invoke "./pep517build/install_metadata.py" "dist/metadata" + (string-append "--prefix=" #$output)))) (replace 'check (lambda _ ;; Tests require a running X server. @@ -1153,35 +1175,30 @@ (define-public gajim (setenv "DISPLAY" ":1") ;; For missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "python" "./setup.py" "test"))) - ;; Loading gajim_remote require running session bus, - ;; which in-turn requires running elogind for XDG_RUNTIME_DIR; - ;; neither of which are possible inside build environment. - (delete 'sanity-check) + (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)) (add-after 'install 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) (add-after 'install 'wrap-env - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (name) - (let ((file (string-append out "/bin/" name)) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program file - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) - '("gajim" "gajim-remote")))))))) + (lambda _ + (for-each + (lambda (name) + (let ((file (string-append #$output "/bin/" name)) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (pixbuf-module-file (getenv "GDK_PIXBUF_MODULE_FILE"))) + (wrap-program file + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("GDK_PIXBUF_MODULE_FILE" = (,pixbuf-module-file))))) + '("gajim" "gajim-remote"))))))) (native-search-paths (list (search-path-specification (variable "GAJIM_PLUGIN_PATH") - (separator #f) ;single entry - (files - (list - "share/gajim/plugins"))) + (separator #f) ; single entry + (files (list "share/gajim/plugins"))) ;; Gajim needs to use the propagated inputs of its plugins. (search-path-specification (variable "GUIX_PYTHONPATH") @@ -1192,7 +1209,7 @@ (define-public gajim ;; FIXME: Cannot use this expression as it would ;; introduce a circular dependency at the top level. ;; (version-major+minor (package-version python)) - "3.9" + "3.10" "/site-packages")))))) (native-inputs (list gettext-minimal @@ -1200,6 +1217,7 @@ (define-public gajim gobject-introspection `(,gtk+ "bin") python-distutils-extra + python-pypa-build python-setuptools xorg-server-for-tests)) (inputs @@ -1235,8 +1253,7 @@ (define-public gajim python-pycairo python-pygobject python-pyopenssl)) - (propagated-inputs - (list dconf)) + (propagated-inputs (list dconf)) (synopsis "Fully-featured XMPP client") (description "Gajim aims to be an easy to use and fully-featured XMPP chat client. It is extensible via plugins, supports end-to-end encryption (OMEMO @@ -1247,7 +1264,7 @@ (define-public gajim (define-public gajim-omemo (package (name "gajim-omemo") - (version "2.8.15") + (version "2.9.0") (source (origin (method url-fetch/zipbomb) @@ -1256,7 +1273,7 @@ (define-public gajim-omemo "https://ftp.gajim.org/plugins/master/omemo/omemo_" version ".zip")) (sha256 - (base32 "1hf148ywr8knk5y3y5xvvwgw74ld1pcfjkp78g514ikcnzfycfcn")))) + (base32 "0yy9r9fsrlgdywiln8bskhi8faj9hnz7b19jcap5nkhv8jn9cqq7")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -1283,7 +1300,7 @@ (define-public gajim-omemo (define-public gajim-openpgp (package (name "gajim-openpgp") - (version "1.4.9") + (version "1.5.0") (source (origin (method url-fetch/zipbomb) @@ -1292,7 +1309,7 @@ (define-public gajim-openpgp "https://ftp.gajim.org/plugins/master/openpgp/openpgp_" version ".zip")) (sha256 - (base32 "1xwmf6ai1z7z9x6p1ysglxji73r7d27c0gzc8ykab29cjhjyv0dq")))) + (base32 "193pbh9iri7bkamvjwp236i8g5zxxiqgsv64kll5sy76vx4q73c4")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) base-commit: dffaf42e5eac3822bd6b44e9749fc8e5f48fb99c -- 2.34.1
Parnikkapore <poomklao@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#64021
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.