From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmgsA-0004r7-1X for guix-patches@gnu.org; Tue, 29 Aug 2017 09:48:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmgs6-0002w1-ON for guix-patches@gnu.org; Tue, 29 Aug 2017 09:48:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dmgs6-0002vx-IS for guix-patches@gnu.org; Tue, 29 Aug 2017 09:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dmgs6-0006G9-CI for guix-patches@gnu.org; Tue, 29 Aug 2017 09:48:02 -0400 Subject: [bug#28276] pybitmessage: Update to 0.6.2 Resent-Message-ID: Date: Tue, 29 Aug 2017 13:47:14 +0000 From: ng0 Message-ID: <20170829134714.nu5tmyour4zgqfaj@abyayala> References: <20170829123858.3jeimmucctlkfmse@abyayala> <20170829131655.zjwzrpejfukjrfp3@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mcmwfpdgvztvo3bb" Content-Disposition: inline In-Reply-To: <20170829131655.zjwzrpejfukjrfp3@abyayala> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28276@debbugs.gnu.org --mcmwfpdgvztvo3bb Content-Type: multipart/mixed; boundary="flgh5utmbawapoy3" Content-Disposition: inline --flgh5utmbawapoy3 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Corrections, version 2. --=20 ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org --flgh5utmbawapoy3 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-pybitmessage-Update-to-0.6.2.patch" Content-Transfer-Encoding: quoted-printable =46rom 9799d73d38b13993c54a1ed85deb61ad075e5675 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Tue, 29 Aug 2017 13:05:40 +0000 Subject: [PATCH] gnu: pybitmessage: Update to 0.6.2. * gnu/packages/messaging.scm (pybitmessage): Update to 0.6.2. [build-system]: Change to python-build-system. [arguments]: Remove "fix-makefile" and "wrap" phases. [inputs]: Rename to... [propagated-inputs]: ...this. Add "python2-msgpack" and "python2-pythondial= og". [inputs]: Move "openssl", "sqlite" and "qt-4" to... [native-inputs]: ...here. Remove "pkg-config". --- gnu/packages/messaging.scm | 71 ++++++++++++++++++++++--------------------= ---- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eb9e86915..4eccd77da 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -5,7 +5,7 @@ ;;; Copyright =C2=A9 2015 Andreas Enge ;;; Copyright =C2=A9 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright =C2=A9 2015 Efraim Flashner -;;; Copyright =C2=A9 2016, 2017 +;;; Copyright =C2=A9 2016, 2017 ;;; Copyright =C2=A9 2016 Andy Patterson ;;; Copyright =C2=A9 2016, 2017 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2017 Mekeor Melire @@ -794,7 +794,7 @@ connect with friends and family without anyone else lis= tening in.") (define-public pybitmessage (package (name "pybitmessage") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) @@ -803,39 +803,30 @@ connect with friends and family without anyone else l= istening in.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ffj7raxpp277kphj98190fxrwfx16vmbspk7k3azg3bh5f5idnf")))) - (inputs - `(("python" ,python-2) - ("python:tk" ,python-2 "tk") - ("openssl" ,openssl) - ("sqlite" ,sqlite) - ("qt" ,qt-4) + "1in2mhaxkp2sx8pgvifq9dk1z8b2x3imf1anr0z926vwxwjrf85w")))) + (propagated-inputs + ;; TODO: + ;; Package "pyopencl", required in addition to numpy for OpenCL suppo= rt. + ;; Package "gst123", required in addition to alsa-utils and + ;; mpg123 for sound support. + `(("python2-msgpack" ,python2-msgpack) + ("python2-pythondialog" ,python2-pythondialog) ("python2-pyqt-4" ,python2-pyqt-4) ("python2-sip" ,python2-sip) ("python2-pysqlite" ,python2-pysqlite) ("python2-pyopenssl" ,python2-pyopenssl))) (native-inputs - `(("pkg-config" ,pkg-config))) - (build-system gnu-build-system) + `(("openssl" ,openssl) + ("sqlite" ,sqlite) + ("qt" ,qt-4))) + (build-system python-build-system) (arguments - `(#:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) - #:make-flags (list (string-append "PREFIX=3D" - (assoc-ref %outputs "out"))) - #:tests? #f ; no test target + `(#:modules ((guix build python-build-system) + (guix build utils)) + #:tests? #f ;no test target + #:python ,python-2 #:phases (modify-phases %standard-phases - (add-before 'build 'fix-makefile - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Makefile" - (("mkdir -p \\$\\{DESTDIR\\}/usr") "") - (("/usr/local") "") - (("/usr") "") - (("#!/bin/sh") (string-append "#!" (which "sh"))) - (("python2") (which "python")) - (("/opt/openssl-compat-bitcoin/lib/") - (string-append (assoc-ref inputs "openssl") "/lib/"))) - #t)) (add-after 'unpack 'fix-unmatched-python-shebangs (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/bitmessagemain.py" @@ -869,18 +860,24 @@ connect with friends and family without anyone else l= istening in.") (string-append (assoc-ref inputs "openssl") "/lib/libssl.so"))) #t)) - ;; XXX: Make does not build and install bitmsghash, do it + (add-after 'unpack 'noninteractive-build + ;; This applies upstream commit 4c597d3f7cf9f83a763472aa165a1a4= 292019f20 + (lambda _ + (substitute* "setup.py" + (("except NameError") + "except EOFError, NameError")) + #t)) + ;; XXX: python setup.py does not build and install bitmsghash, + ;; without it PyBitmessage tries to compile it at first run + ;; in the store, which due to obvious reasons fails. Do it ;; and place it in /lib. - (add-before 'build 'build-and-install-bitmsghash + (add-after 'unpack 'build-and-install-bitmsghash (lambda* (#:key outputs #:allow-other-keys) - (chdir "src/bitmsghash") - (system* "make") - (chdir "../..") - (install-file "src/bitmsghash/bitmsghash.so" - (string-append (assoc-ref outputs "out") "/lib"= )) - #t)) - (add-after 'install 'wrap - (@@ (guix build python-build-system) wrap))))) + (with-directory-excursion "src/bitmsghash" + (system* "make") + (install-file "bitmsghash.so" + (string-append (assoc-ref outputs "out") "/li= b"))) + #t))))) (license license:expat) (description "Distributed and trustless peer-to-peer communications protocol --=20 2.14.1 --flgh5utmbawapoy3-- --mcmwfpdgvztvo3bb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlmlcGIACgkQ4i+bv+40 hYh1RA/+JmIKFFE/z2S4TuckLeR2sGhBSQrw8mlDocr3FV0oPDshoG/Q++Q3Mm+H 7iaf3T6msh7C0/+EYERIW4Dbb1k/hLdq1kJZA2i4ymurRhWZ1MeRPDPSa1FK0NZF TBEEFxcHp4S8LyZaZf9RyObKZbst9tGpifmhhtHjFRb6AldvWOIMBQvC0nFWW98D F/wrgMJZDDrASZf8rZ4K2+Yr8XZsH4gAz7Bm3LohURDB2099BWYamwvnZhqzlFUT TE7f78QeXMxq/GySnoSTGmnXmgmFbCnEeux3sSAYa4JSeuXVRTqWfSKumcZYP52E kPKeSjnZYtagtEV+XI/KyUrIhCqmsaMDj1vqkTwTtDlz/d0MQusVz55zZS631E3Y M0ImkVgC2bkP9gjw5QlycwC6XbEM9UteIi7EgjL3LXpDwDxij8buOMpT6MOykSR2 T8+s32i0SI4uNlL8w54gorfRAWD2KZ3p2hIwD78Dimfmb8U0YFNBJAHw9d6er/9Y icwvp0CmxiCACs5o7FE1YF7vBLmSQpuzxSAYs8iUBU6nDwbSxUlY3nIMlp+8KALF Jd4vOc/FZn3+JwOYyZeBBlU2EuZosXP7JH6es9OeD9J9Ofo8LUlMlQdceDLUy8yo 3R75vdzOOI8MSncwJR9RW60kZsZEpF/ukVv3kmN9PeUB8ppbqE0= =CfDf -----END PGP SIGNATURE----- --mcmwfpdgvztvo3bb--