* [bug#28276] pybitmessage: Update to 0.6.2 @ 2017-08-29 12:38 ng0 2017-08-29 13:16 ` ng0 0 siblings, 1 reply; 9+ messages in thread From: ng0 @ 2017-08-29 12:38 UTC (permalink / raw) To: 28276 [-- Attachment #1: Type: text/plain, Size: 338 bytes --] The ticket will get the patch for the 0.6.1 -> 0.6.2 Update today. I'm done, I just need to attend some other business right now. If you see the ticket now, check again in 1 - 3 hours. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#28276] pybitmessage: Update to 0.6.2 2017-08-29 12:38 [bug#28276] pybitmessage: Update to 0.6.2 ng0 @ 2017-08-29 13:16 ` ng0 2017-08-29 13:47 ` ng0 0 siblings, 1 reply; 9+ messages in thread From: ng0 @ 2017-08-29 13:16 UTC (permalink / raw) To: 28276 [-- Attachment #1.1: Type: text/plain, Size: 166 bytes --] Patch appended. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #1.2: 0001-gnu-pybitmessage-Update-to-0.6.2.patch --] [-- Type: text/plain, Size: 5740 bytes --] From 86eee76ce939b825e61fbb90d2a5332202e6bb4b Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> 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. [native-inputs]: Rename to... [propagated-inputs]: ...this. Add "python2-msgpack" and "python2-pythondialog". --- gnu/packages/messaging.scm | 64 ++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eb9e86915..ab49ee563 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016, 2017 <contact.ng0@cryptolab.net> +;;; Copyright © 2016, 2017 <ng0@infotropique.org> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> @@ -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,10 +803,16 @@ connect with friends and family without anyone else listening in.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ffj7raxpp277kphj98190fxrwfx16vmbspk7k3azg3bh5f5idnf")))) - (inputs + "1in2mhaxkp2sx8pgvifq9dk1z8b2x3imf1anr0z926vwxwjrf85w")))) + (propagated-inputs + ;; TODO: + ;; Package "pyopencl", required in addition to numpy for OpenCL support. + ;; Package "gst123", required in addition to alsa-utils and + ;; mpg123 for sound support. `(("python" ,python-2) ("python:tk" ,python-2 "tk") + ("python2-msgpack" ,python2-msgpack) + ("python2-pythondialog" ,python2-pythondialog) ("openssl" ,openssl) ("sqlite" ,sqlite) ("qt" ,qt-4) @@ -814,28 +820,14 @@ connect with friends and family without anyone else listening in.") ("python2-sip" ,python2-sip) ("python2-pysqlite" ,python2-pysqlite) ("python2-pyopenssl" ,python2-pyopenssl))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (build-system gnu-build-system) + (build-system python-build-system) (arguments - `(#:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) - #:make-flags (list (string-append "PREFIX=" - (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 +861,24 @@ connect with friends and family without anyone else 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 4c597d3f7cf9f83a763472aa165a1a4292019f20 + (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 -- 2.14.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#28276] pybitmessage: Update to 0.6.2 2017-08-29 13:16 ` ng0 @ 2017-08-29 13:47 ` ng0 2017-08-29 13:53 ` ng0 0 siblings, 1 reply; 9+ messages in thread From: ng0 @ 2017-08-29 13:47 UTC (permalink / raw) To: 28276 [-- Attachment #1.1: Type: text/plain, Size: 174 bytes --] Corrections, version 2. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #1.2: 0001-gnu-pybitmessage-Update-to-0.6.2.patch --] [-- Type: text/plain, Size: 5869 bytes --] From 9799d73d38b13993c54a1ed85deb61ad075e5675 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> 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-pythondialog". [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 © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016, 2017 <contact.ng0@cryptolab.net> +;;; Copyright © 2016, 2017 <ng0@infotropique.org> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> @@ -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 else 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 support. + ;; 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=" - (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 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 4c597d3f7cf9f83a763472aa165a1a4292019f20 + (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 -- 2.14.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#28276] pybitmessage: Update to 0.6.2 2017-08-29 13:47 ` ng0 @ 2017-08-29 13:53 ` ng0 2017-08-29 14:00 ` ng0 2017-08-29 14:06 ` ng0 0 siblings, 2 replies; 9+ messages in thread From: ng0 @ 2017-08-29 13:53 UTC (permalink / raw) To: 28276 [-- Attachment #1: Type: text/plain, Size: 6830 bytes --] ng0 transcribed 7.2K bytes: > Corrections, version 2. > -- > ng0 > GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 > GnuPG: https://n0is.noblogs.org/my-keys > https://www.infotropique.org https://krosos.org > From 9799d73d38b13993c54a1ed85deb61ad075e5675 Mon Sep 17 00:00:00 2001 > From: ng0 <ng0@infotropique.org> > 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-pythondialog". > [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 © 2015 Andreas Enge <andreas@enge.fr> > ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> > ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> > -;;; Copyright © 2016, 2017 <contact.ng0@cryptolab.net> > +;;; Copyright © 2016, 2017 <ng0@infotropique.org> > ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> > ;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org> > ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> > @@ -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 else 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 support. > + ;; 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) ^ referenced in a file > + ("sqlite" ,sqlite) > + ("qt" ,qt-4))) ^ 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. > + (build-system python-build-system) > (arguments > - `(#:imported-modules ((guix build python-build-system) > - ,@%gnu-build-system-modules) > - #:make-flags (list (string-append "PREFIX=" > - (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 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 4c597d3f7cf9f83a763472aa165a1a4292019f20 > + (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 > -- > 2.14.1 > -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#28276] pybitmessage: Update to 0.6.2 2017-08-29 13:53 ` ng0 @ 2017-08-29 14:00 ` ng0 2017-08-29 14:06 ` ng0 1 sibling, 0 replies; 9+ messages in thread From: ng0 @ 2017-08-29 14:00 UTC (permalink / raw) To: 28276 [-- Attachment #1: Type: text/plain, Size: 7474 bytes --] ng0 transcribed 7.6K bytes: > ng0 transcribed 7.2K bytes: > > Corrections, version 2. > > -- > > ng0 > > GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 > > GnuPG: https://n0is.noblogs.org/my-keys > > https://www.infotropique.org https://krosos.org > > > From 9799d73d38b13993c54a1ed85deb61ad075e5675 Mon Sep 17 00:00:00 2001 > > From: ng0 <ng0@infotropique.org> > > 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-pythondialog". > > [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 © 2015 Andreas Enge <andreas@enge.fr> > > ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> > > ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> > > -;;; Copyright © 2016, 2017 <contact.ng0@cryptolab.net> > > +;;; Copyright © 2016, 2017 <ng0@infotropique.org> > > ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> > > ;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org> > > ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> > > @@ -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 else 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 support. > > + ;; 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) > > ^ referenced in a file > > > + ("sqlite" ,sqlite) > > + ("qt" ,qt-4))) > > ^ 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. > > > + (build-system python-build-system) > > (arguments > > - `(#:imported-modules ((guix build python-build-system) > > - ,@%gnu-build-system-modules) > > - #:make-flags (list (string-append "PREFIX=" > > - (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 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 4c597d3f7cf9f83a763472aa165a1a4292019f20 > > + (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 > > -- > > 2.14.1 > > > > > > > -- > ng0 > GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 > GnuPG: https://n0is.noblogs.org/my-keys > https://www.infotropique.org https://krosos.org -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#28276] pybitmessage: Update to 0.6.2 2017-08-29 13:53 ` ng0 2017-08-29 14:00 ` ng0 @ 2017-08-29 14:06 ` ng0 2017-09-30 14:13 ` Christopher Baines 1 sibling, 1 reply; 9+ messages in thread From: ng0 @ 2017-08-29 14:06 UTC (permalink / raw) To: 28276 [-- Attachment #1.1: Type: text/plain, Size: 173 bytes --] Last version of patch. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org [-- Attachment #1.2: 0001-gnu-pybitmessage-Update-to-0.6.2.patch --] [-- Type: text/plain, Size: 5824 bytes --] From 0c7f434ba3659825bae141dcb22d9816b4ad544d Mon Sep 17 00:00:00 2001 From: ng0 <ng0@infotropique.org> 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-pythondialog". [inputs]: Remove "sqlite" and "qt-4". Move "openssl" ... [native-inputs]: ...here. Remove "pkg-config". --- gnu/packages/messaging.scm | 69 +++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eb9e86915..2c9197218 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016, 2017 <contact.ng0@cryptolab.net> +;;; Copyright © 2016, 2017 <ng0@infotropique.org> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> @@ -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,28 @@ connect with friends and family without anyone else 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 support. + ;; 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))) + (build-system python-build-system) (arguments - `(#:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) - #:make-flags (list (string-append "PREFIX=" - (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 +858,24 @@ connect with friends and family without anyone else 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 4c597d3f7cf9f83a763472aa165a1a4292019f20 + (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 -- 2.14.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#28276] pybitmessage: Update to 0.6.2 2017-08-29 14:06 ` ng0 @ 2017-09-30 14:13 ` Christopher Baines 2017-09-30 14:18 ` ng0 0 siblings, 1 reply; 9+ messages in thread From: Christopher Baines @ 2017-09-30 14:13 UTC (permalink / raw) To: ng0; +Cc: 28276 [-- Attachment #1: Type: text/plain, Size: 282 bytes --] On Tue, 29 Aug 2017 14:06:04 +0000 ng0 <ng0@infotropique.org> wrote: > Last version of patch. I've had a look at the patch attached, and it looks ok to me (I've never used pybitmessage). If you can confirm that this is definitely good to be merged, I'm happy to merge it? [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 963 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#28276] pybitmessage: Update to 0.6.2 2017-09-30 14:13 ` Christopher Baines @ 2017-09-30 14:18 ` ng0 2017-09-30 14:26 ` bug#28276: " Christopher Baines 0 siblings, 1 reply; 9+ messages in thread From: ng0 @ 2017-09-30 14:18 UTC (permalink / raw) To: Christopher Baines; +Cc: 28276 [-- Attachment #1: Type: text/plain, Size: 581 bytes --] Christopher Baines transcribed 1.5K bytes: > On Tue, 29 Aug 2017 14:06:04 +0000 > ng0 <ng0@infotropique.org> wrote: > > > Last version of patch. > > I've had a look at the patch attached, and it looks ok to me (I've > never used pybitmessage). If you can confirm that this is definitely > good to be merged, I'm happy to merge it? I don't use Bitmessage anymore, but I have used this patch to send some messages around. -- ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://krosos.org/dist/keys/ https://www.infotropique.org https://krosos.org [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#28276: pybitmessage: Update to 0.6.2 2017-09-30 14:18 ` ng0 @ 2017-09-30 14:26 ` Christopher Baines 0 siblings, 0 replies; 9+ messages in thread From: Christopher Baines @ 2017-09-30 14:26 UTC (permalink / raw) To: ng0; +Cc: 28276-done [-- Attachment #1: Type: text/plain, Size: 593 bytes --] On Sat, 30 Sep 2017 14:18:38 +0000 ng0 <ng0@infotropique.org> wrote: > Christopher Baines transcribed 1.5K bytes: > > On Tue, 29 Aug 2017 14:06:04 +0000 > > ng0 <ng0@infotropique.org> wrote: > > > > > Last version of patch. > > > > I've had a look at the patch attached, and it looks ok to me (I've > > never used pybitmessage). If you can confirm that this is definitely > > good to be merged, I'm happy to merge it? > > I don't use Bitmessage anymore, but > I have used this patch to send some messages around. That sounds ok to me. I've now merged this patch :) [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 963 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-09-30 14:27 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-08-29 12:38 [bug#28276] pybitmessage: Update to 0.6.2 ng0 2017-08-29 13:16 ` ng0 2017-08-29 13:47 ` ng0 2017-08-29 13:53 ` ng0 2017-08-29 14:00 ` ng0 2017-08-29 14:06 ` ng0 2017-09-30 14:13 ` Christopher Baines 2017-09-30 14:18 ` ng0 2017-09-30 14:26 ` bug#28276: " Christopher Baines
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).