From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmh5o-00038e-Oa for guix-patches@gnu.org; Tue, 29 Aug 2017 10:02:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmh5g-0003IU-EU for guix-patches@gnu.org; Tue, 29 Aug 2017 10:02:12 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:52150) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dmh5g-0003IC-A2 for guix-patches@gnu.org; Tue, 29 Aug 2017 10:02:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dmh5d-0006jU-Kb for guix-patches@gnu.org; Tue, 29 Aug 2017 10:02:03 -0400 Subject: [bug#28276] pybitmessage: Update to 0.6.2 Resent-Message-ID: Date: Tue, 29 Aug 2017 14:00:34 +0000 From: ng0 Message-ID: <20170829140034.z3ozgrezj3r7zfe4@abyayala> References: <20170829123858.3jeimmucctlkfmse@abyayala> <20170829131655.zjwzrpejfukjrfp3@abyayala> <20170829134714.nu5tmyour4zgqfaj@abyayala> <20170829135311.n4io2ah6cazzod7c@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="2d3icl3ynagisbzp" Content-Disposition: inline In-Reply-To: <20170829135311.n4io2ah6cazzod7c@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 --2d3icl3ynagisbzp Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable ng0 transcribed 7.6K bytes: > ng0 transcribed 7.2K bytes: > > Corrections, version 2. > > --=20 > > ng0 > > GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 > > GnuPG: https://n0is.noblogs.org/my-keys > > https://www.infotropique.org https://krosos.org >=20 > > From 9799d73d38b13993c54a1ed85deb61ad075e5675 Mon Sep 17 00:00:00 2001 > > From: ng0 > > Date: Tue, 29 Aug 2017 13:05:40 +0000 > > Subject: [PATCH] gnu: pybitmessage: Update to 0.6.2. > >=20 > > * 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-python= dialog". > > [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(-) > >=20 > > 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= listening 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 el= se listening 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 s= upport. > > + ;; 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) >=20 > ^ referenced in a file >=20 > > + ("sqlite" ,sqlite) > > + ("qt" ,qt-4))) >=20 > ^ well the previous gnu-build-system based one > required qt4 and sqlite among other things. > They do not end up in the references of the store > path this time. Can we drop them? Starting and > sending + receiving a message worked. I just checked the 0.6.1 build, it did not reference qt4 and sqlite aswell. I'm sending an updated patch to drop them, see if it works. >=20 > > + (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 el= se listening 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 4c597d3f7cf9f83a763472aa165= a1a4292019f20 > > + (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") = "/lib"))) > > + #t))))) > > (license license:expat) > > (description > > "Distributed and trustless peer-to-peer communications protocol > > --=20 > > 2.14.1 > >=20 >=20 >=20 >=20 >=20 > --=20 > ng0 > GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 > GnuPG: https://n0is.noblogs.org/my-keys > https://www.infotropique.org https://krosos.org --=20 ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org --2d3icl3ynagisbzp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlmlc4IACgkQ4i+bv+40 hYjPYRAAiugYaUNkTGRvLu7r+mSbAYG4W0r8KjCMbfHWiFCtr/2fkhe0Ttvy4YE6 rgtlnHmFzJu1IS5Ibnpfswk5jNOl5LkuAmybl97p2NIaSlkPUWTi+D+E4oQw0mQw xhfzFYXxft2mQ+fX1+JlpK9NSzBHEzAxuI4iR83m15ht8P17q933M+cpaxzI4anU 7hB1fxmd9h7ByNchMwmyr1eP3ZqeuzdPAlY57OFYTxqDr4WiyChyEI9xTXzxhVZs wvOg1UDAcq/6YNyRMiEQCBD3G8QY5uNLJ6UWp7l11QH9Rg/x4QzdYbtxuAJ6u6Pd 64N87aMBOiCEspkSvwOn7SwVj5nKffVbG2OQfFxw1Es6mxf+uKHI8gf1PQShHAam L1hJ4UgEwhQKOaq3rFB0Kdz6rOVGBkqOSF9KA14zQZ0oVVssoEQba756n8cz4KGY DhXk4TxgwsoGA8WM9OxLXp1Bn3JeCo0copOPC1haUpGjzrhUG1JD1f9ypHnecj4U gGYZawFFmfWTOsHlnOs28dWX8Tx8w0DeUi1FISiRZ0JDUbxbHVTfPWdh8nYvyWzR paEczcI2hgxx02nAM/Mc4vrwTh9O4xHHUNeXi2ANttph/sLZCZLRG0azB1knwgaj h3olfUE2h9OgtckdyGQ0E5MT5TkzADHxJ89CaFMQG63xd6XNhF8= =7+cA -----END PGP SIGNATURE----- --2d3icl3ynagisbzp--