* [PATCH] gnunet-svn, gnunet-gtk-svn @ 2016-07-30 15:11 ng0 2016-07-30 15:41 ` ng0 2016-07-31 13:08 ` ng0 0 siblings, 2 replies; 29+ messages in thread From: ng0 @ 2016-07-30 15:11 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 568 bytes --] This is functional, but it suffers the same bug as the gnunet-0.10.1 package. I will write a gnunet-service for guix which will fix all versions. The expected behavior for installing gnunet is: create gnunet user with gnunet group, create gnunet-dns group, build, install, configure through gnunet-setup -c /path/to/gnunet.conf or setup without graphical tools, add regular user to gnunet group, run gnunet stuff with regular user. You will experience the same stability with this svn as with 0.10.1 but it will have the same broken behavior until I have fixed it. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-Add-gnunet-svn.patch --] [-- Type: text/x-patch, Size: 4359 bytes --] From b5d7d060941cf8ed73c78f2666be6e176d8ea57d Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Sat, 30 Jul 2016 14:09:31 +0000 Subject: [PATCH 1/2] gnu: Add gnunet-svn. * gnu/packages/gnunet.scm (gnunet-svn): New variable. --- gnu/packages/gnunet.scm | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 4d888bd..25ac073 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -54,6 +54,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix build-system gnu)) (define-public libextractor @@ -330,3 +331,84 @@ services.") `(("pkg-config" ,pkg-config) ("libglade" ,libglade))) (synopsis "Graphical front-end tools for GNUnet"))) + +;; gnunet-fs 0.9, 0.10.1 and HEAD are incompatible to each other as +;; explained here https://gnunet.org/bot/log/gnunet/2016-06-23#T1067897 +;; We use a revision of a proven and confirmed to be usable and stable +;; version before refactoring work towards 0.10.2 started. + +(define-public gnunet-svn + (let ((svn-revision 37273)) + (package + (name "gnunet-svn") + (version (string-append "0.10.1" "-1" ".svn" + (number->string svn-revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "https://gnunet.org/svn/gnunet/") + (revision svn-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0xn8g0mk2nl142yz4zzrj25rpnhxfvjwnfnangyx8s44xv75i2dc")))) + (build-system gnu-build-system) + (inputs + `(("glpk" ,glpk) + ("gnurl" ,gnurl) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("gnutls" ,gnutls) + ("libextractor" ,libextractor) + ("libgcrypt" ,libgcrypt) + ("libidn" ,libidn) + ("libmicrohttpd" ,libmicrohttpd) + ("libltdl" ,libltdl) + ("libunistring" ,libunistring) + ("openssl" ,openssl) + ("opus" ,opus) + ("pulseaudio" ,pulseaudio) + ("sqlite" ,sqlite) + ("zlib" ,zlib) + ("python" ,python-2))) ; tests and gnunet-qr + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("gnu-gettext" ,gnu-gettext) + ("libtool" ,libtool))) + (arguments + '(#:configure-flags + (list (string-append "--with-nssdir=" %output "/lib")) + #:parallel-tests? #f ; parallel building is not functional + #:tests? #f ; FAIL: test_testbed_logger_api + #:phases + ;; swap check and install phases and set paths to installed bin + (modify-phases %standard-phases + (add-after 'unpack 'patch-bin-sh + (lambda _ + (and + (substitute* '("bootstrap") + (("contrib/pogen.sh") "sh contrib/pogen.sh")) + (for-each (lambda (f) (chmod f #o755)) + (find-files "po" ""))))) + (add-after 'patch-bin-sh 'bootstrap + (lambda _ + (zero? + (system* "sh" "bootstrap")))) + (add-before 'check 'set-path-for-check + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "GNUNET_PREFIX" (string-append out "/lib")) + (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")))))))) + (synopsis "Secure, decentralized, peer-to-peer networking framework") + (description + "GNUnet is a framework for secure peer-to-peer networking. The +high-level goal is to provide a strong foundation of free software for a +global, distributed network that provides security and privacy. GNUnet in +that sense aims to replace the current internet protocol stack. Along with +an application for secure publication of files, it has grown to include all +kinds of basic applications for the foundation of a GNU internet.") + (license license:gpl3+) + (home-page "https://gnunet.org/")))) -- 2.9.2 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: 0002-gnu-Add-gnunet-gtk-svn.patch --] [-- Type: text/x-patch, Size: 2395 bytes --] From 756e355a24b508ff5434e34002545c994a18df3a Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Sat, 30 Jul 2016 15:04:24 +0000 Subject: [PATCH 2/2] gnu: Add gnunet-gtk-svn. * gnu/packages/gnunet.scm (gnunet-gtk-svn): New variable. --- gnu/packages/gnunet.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 25ac073..a3f34ea 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -412,3 +412,50 @@ an application for secure publication of files, it has grown to include all kinds of basic applications for the foundation of a GNU internet.") (license license:gpl3+) (home-page "https://gnunet.org/")))) + +(define-public gnunet-gtk-svn + (let ((svn-revision 37273)) + (package + (inherit gnunet-svn) + (name "gnunet-gtk-svn") + (version (package-version gnunet-svn)) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "https://gnunet.org/svn/gnunet-gtk/") + (revision svn-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1mckc5aq05wpbvb8mbm0llkhavb0j2f496l73zaapdy3ndyhai8j")))) + (arguments + `(#:configure-flags + (list "--without-libunique" + "--with-qrencode" + (string-append "--with-gnunet=" + (assoc-ref %build-inputs "gnunet-svn"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (inputs + `(("gnunet-svn" ,gnunet-svn) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gnutls" ,gnutls) + ("libgcrypt" ,libgcrypt) + ("gtk+" ,gtk+) + ("libextractor" ,libextractor) + ("glade3" ,glade3) + ("qrencode" ,qrencode))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("libglade" ,libglade) + ("autoconf" ,autoconf) + ("gnu-gettext" ,gnu-gettext) + ("automake" ,automake) + ("libtool" ,libtool))) + (synopsis "Graphical front-end tools for GNUnet") + (home-page "https://gnunet.org")))) + -- 2.9.2 [-- Attachment #4: Type: text/plain, Size: 152 bytes --] Thanks for reviewing. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-07-30 15:11 [PATCH] gnunet-svn, gnunet-gtk-svn ng0 @ 2016-07-30 15:41 ` ng0 2016-07-30 15:56 ` ng0 2016-07-31 13:08 ` ng0 1 sibling, 1 reply; 29+ messages in thread From: ng0 @ 2016-07-30 15:41 UTC (permalink / raw) To: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > This is functional, but it suffers the same bug as the gnunet-0.10.1 > package. I will write a gnunet-service for guix which will fix all > versions. > The expected behavior for installing gnunet is: create gnunet user with > gnunet group, create gnunet-dns group, build, install, configure through > gnunet-setup -c /path/to/gnunet.conf or setup without graphical tools, > add regular user to gnunet group, run gnunet stuff with regular user. > > You will experience the same stability with this svn as with 0.10.1 but > it will have the same broken behavior until I have fixed it. I am running a `gnunet-search avi' now to see how badly it needs to be fixed, but writing the service is in my own interest, so this will happen as the next contribution. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-07-30 15:41 ` ng0 @ 2016-07-30 15:56 ` ng0 0 siblings, 0 replies; 29+ messages in thread From: ng0 @ 2016-07-30 15:56 UTC (permalink / raw) To: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > ng0 <ng0@we.make.ritual.n0.is> writes: > >> This is functional, but it suffers the same bug as the gnunet-0.10.1 >> package. I will write a gnunet-service for guix which will fix all >> versions. >> The expected behavior for installing gnunet is: create gnunet user with >> gnunet group, create gnunet-dns group, build, install, configure through >> gnunet-setup -c /path/to/gnunet.conf or setup without graphical tools, >> add regular user to gnunet group, run gnunet stuff with regular user. >> >> You will experience the same stability with this svn as with 0.10.1 but >> it will have the same broken behavior until I have fixed it. > > I am running a `gnunet-search avi' now to see how badly it needs to be > fixed, but writing the service is in my own interest, so this will > happen as the next contribution. It is functional on that level, results come in after a while. Whoever reviews, run this[0] instead and wait long enough. Maybe you even need to run gnunet-setup before, adding the service would fix this a bit. [0]: `gnunet-search -V avi' Off I go to openrc + guix service writing/debugging :) -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-07-30 15:11 [PATCH] gnunet-svn, gnunet-gtk-svn ng0 2016-07-30 15:41 ` ng0 @ 2016-07-31 13:08 ` ng0 2016-08-01 14:34 ` ng0 2016-08-01 22:21 ` Andreas Enge 1 sibling, 2 replies; 29+ messages in thread From: ng0 @ 2016-07-31 13:08 UTC (permalink / raw) To: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > This is functional, but it suffers the same bug as the gnunet-0.10.1 > package. I will write a gnunet-service for guix which will fix all > versions. > The expected behavior for installing gnunet is: create gnunet user with > gnunet group, create gnunet-dns group, build, install, configure through > gnunet-setup -c /path/to/gnunet.conf or setup without graphical tools, > add regular user to gnunet group, run gnunet stuff with regular user. > > You will experience the same stability with this svn as with 0.10.1 but > it will have the same broken behavior until I have fixed it. > > + (arguments > + '(#:configure-flags > + (list (string-append "--with-nssdir=" %output "/lib")) > + #:parallel-tests? #f ; parallel building is not functional > + #:tests? #f ; FAIL: test_testbed_logger_api Comment in the previous patch I received: > > Okay, is it easy to disable just the failing test? Also, can you > > include a link to the upstream bug report in this comment? This was another failing test, someone before me reported it and therefore I have no bugreport to point to. I consider it superfluous work to fix 0.10.1 (the (define-public gnunet)) now that work towards 0.10.2 release happens. Tests might or might not change, so the svn version is more logical to fix and report bugs on. The failing more current test will be reported as soon as I have time for it. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-07-31 13:08 ` ng0 @ 2016-08-01 14:34 ` ng0 2016-08-01 19:01 ` Catonano 2016-08-01 22:21 ` Andreas Enge 1 sibling, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-01 14:34 UTC (permalink / raw) To: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > ng0 <ng0@we.make.ritual.n0.is> writes: > >> This is functional, but it suffers the same bug as the gnunet-0.10.1 >> package. I will write a gnunet-service for guix which will fix all >> versions. >> The expected behavior for installing gnunet is: create gnunet user with >> gnunet group, create gnunet-dns group, build, install, configure through >> gnunet-setup -c /path/to/gnunet.conf or setup without graphical tools, >> add regular user to gnunet group, run gnunet stuff with regular user. >> >> You will experience the same stability with this svn as with 0.10.1 but >> it will have the same broken behavior until I have fixed it. >> >> + (arguments >> + '(#:configure-flags >> + (list (string-append "--with-nssdir=" %output "/lib")) >> + #:parallel-tests? #f ; parallel building is not functional >> + #:tests? #f ; FAIL: test_testbed_logger_api > > Comment in the previous patch I received: > >> > Okay, is it easy to disable just the failing test? Also, can you > > > include a link to the upstream bug report in this comment? > > This was another failing test, someone before me reported it and > therefore I have no bugreport to point to. I consider it superfluous > work to fix 0.10.1 (the (define-public gnunet)) now that work towards > 0.10.2 release happens. Tests might or might not change, so the svn > version is more logical to fix and report bugs on. > > The failing more current test will be reported as soon as I have time > for it. "The refactoring of the gnunet code is going on like a thunderstorm." Work towards 0.10.2 release - so maybe the failing test will just be resolved with the next version release. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-01 14:34 ` ng0 @ 2016-08-01 19:01 ` Catonano 2016-08-01 19:42 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: Catonano @ 2016-08-01 19:01 UTC (permalink / raw) To: ng0; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 246 bytes --] 2016-08-01 16:34 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > "The refactoring of the gnunet code is going on like a thunderstorm." > I can't see this sentence in the gnunet irc log, neither on the mailing list archive Where did you get it ? [-- Attachment #2: Type: text/html, Size: 674 bytes --] ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-01 19:01 ` Catonano @ 2016-08-01 19:42 ` ng0 0 siblings, 0 replies; 29+ messages in thread From: ng0 @ 2016-08-01 19:42 UTC (permalink / raw) To: Catonano; +Cc: guix-devel Catonano <catonano@gmail.com> writes: > 2016-08-01 16:34 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > > > >> "The refactoring of the gnunet code is going on like a thunderstorm." >> > > I can't see this sentence in the gnunet irc log, neither on the mailing > list archive > > Where did you get it ? Somewhere else, just a comment which I see fitting for the development. Point is that they are working hard on making 0.10.2 happening, maybe even at the end of the summer. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-07-31 13:08 ` ng0 2016-08-01 14:34 ` ng0 @ 2016-08-01 22:21 ` Andreas Enge 2016-08-02 8:27 ` ng0 1 sibling, 1 reply; 29+ messages in thread From: Andreas Enge @ 2016-08-01 22:21 UTC (permalink / raw) To: ng0; +Cc: guix-devel On Sun, Jul 31, 2016 at 01:08:54PM +0000, ng0 wrote: > This was another failing test, someone before me reported it and > therefore I have no bugreport to point to. I consider it superfluous > work to fix 0.10.1 (the (define-public gnunet)) now that work towards > 0.10.2 release happens. Tests might or might not change, so the svn > version is more logical to fix and report bugs on. So maybe it may make sense to wait for 0.10.2 instead of adding packages based on unreleased commits? In the meantime, you could work with upstream to iron out test failures, and when 0.10.2 comes out, you might have a working gnunet package. Andreas ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-01 22:21 ` Andreas Enge @ 2016-08-02 8:27 ` ng0 2016-08-02 10:30 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-02 8:27 UTC (permalink / raw) To: Andreas Enge; +Cc: guix-devel Andreas Enge <andreas@enge.fr> writes: > On Sun, Jul 31, 2016 at 01:08:54PM +0000, ng0 wrote: >> This was another failing test, someone before me reported it and >> therefore I have no bugreport to point to. I consider it superfluous >> work to fix 0.10.1 (the (define-public gnunet)) now that work towards >> 0.10.2 release happens. Tests might or might not change, so the svn >> version is more logical to fix and report bugs on. > > So maybe it may make sense to wait for 0.10.2 instead of adding packages > based on unreleased commits? In the meantime, you could work with upstream > to iron out test failures, and when 0.10.2 comes out, you might have a > working gnunet package. > > Andreas The reason for packaging -svn was to offer an regulary checked and updated svn revision of gnunet. I don't know much about what the 0.10.2 release will mean, certainly it will mean the API compability is fixed for those who update to 0.10.2. It can be the end of the summer, it can be the end of the year. the targeted date was 2016-07-01. They are working quick, but I don't know what needs to be fixed etc. My contribution so far is just gnunet-gtk.desktop, something I feel like it's safe enough but necessary. If we had just 0.10.2, it would rule out one problem of my bigger roadmap. But people who would want to develop for it and use Guix at the same time, would want svn. Normaly HEAD isn't broken, it's as good as a release if they would not change this much at the moment. Should I provide -svn outside of Guix master? Should the -svn I provided just become a base for 0.10.2, waiting for release? The idea was a different one.. like guile and guile-next, 2 releases, however I have to pin to a number for the reasons explained above. Based on this, could you still review it so independent from the decision I can have apply changes? If the decision is that having 2 versions and one working as the -svn I described above is not okay at the present moment, I will just start working on the gnunet-service. Thanks, -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-02 8:27 ` ng0 @ 2016-08-02 10:30 ` ng0 2016-08-02 13:05 ` Catonano 0 siblings, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-02 10:30 UTC (permalink / raw) To: Andreas Enge; +Cc: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > Andreas Enge <andreas@enge.fr> writes: > >> On Sun, Jul 31, 2016 at 01:08:54PM +0000, ng0 wrote: >>> This was another failing test, someone before me reported it and >>> therefore I have no bugreport to point to. I consider it superfluous >>> work to fix 0.10.1 (the (define-public gnunet)) now that work towards >>> 0.10.2 release happens. Tests might or might not change, so the svn >>> version is more logical to fix and report bugs on. >> >> So maybe it may make sense to wait for 0.10.2 instead of adding packages >> based on unreleased commits? In the meantime, you could work with upstream >> to iron out test failures, and when 0.10.2 comes out, you might have a >> working gnunet package. >> >> Andreas > > The reason for packaging -svn was to offer an regulary checked and > updated svn revision of gnunet. I don't know much about what the 0.10.2 > release will mean, certainly it will mean the API compability is fixed > for those who update to 0.10.2. > It can be the end of the summer, it can be the end of the year. the > targeted date was 2016-07-01. They are working quick, but I don't know > what needs to be fixed etc. My contribution so far is just > gnunet-gtk.desktop, something I feel like it's safe enough but > necessary. > > If we had just 0.10.2, it would rule out one problem of my bigger > roadmap. But people who would want to develop for it and use Guix at the > same time, would want svn. Normaly HEAD isn't broken, it's as good as a > release if they would not change this much at the moment. > > Should I provide -svn outside of Guix master? > > Should the -svn I provided just become a base for 0.10.2, waiting for > release? The idea was a different one.. like guile and guile-next, 2 > releases, however I have to pin to a number for the reasons explained > above. > > > Based on this, could you still review it so independent from the > decision I can have apply changes? > If the decision is that having 2 versions and one working as the -svn I > described above is not okay at the present moment, I will just start > working on the gnunet-service. Development is a bad example, but for the current state, not considering "0.10.2 will be out soon", the existence of -svn on a system was more than just for development. When you read the old threads you can see that release tarballs are just svn revisions with no additional changes. With this recent change, maybe out-of-tree is a better place. Fyi, I tried with most recent head and tests no longer fail it seems. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-02 10:30 ` ng0 @ 2016-08-02 13:05 ` Catonano 2016-08-02 14:09 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: Catonano @ 2016-08-02 13:05 UTC (permalink / raw) To: ng0; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 808 bytes --] 2016-08-02 12:30 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > > Development is a bad example, but for the current state, not considering > "0.10.2 will be out soon", the existence of -svn on a system was more > than just for development. > In fact, for what it matters, I'd like to be able to play with Gnunet. Installing a development version on my own is too difficult for me, having it in Guix would be a boon > When you read the old threads you can see that release > tarballs are just svn revisions with no additional changes. > > With this recent change, maybe out-of-tree is a better place. > Which recent change ? What does "out-of-tree" exactly mean ? > > Fyi, I tried with most recent head and tests no longer fail it seems. > This is one more reason to provide a package from a checkout. [-- Attachment #2: Type: text/html, Size: 1604 bytes --] ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-02 13:05 ` Catonano @ 2016-08-02 14:09 ` ng0 2016-08-02 14:57 ` Catonano 0 siblings, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-02 14:09 UTC (permalink / raw) To: Catonano; +Cc: guix-devel Catonano <catonano@gmail.com> writes: > 2016-08-02 12:30 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > >> >> Development is a bad example, but for the current state, not considering >> "0.10.2 will be out soon", the existence of -svn on a system was more >> than just for development. >> > > In fact, for what it matters, I'd like to be able to play with Gnunet. > > Installing a development version on my own is too difficult for me, having > it in Guix would be a boon > > > >> When you read the old threads you can see that release >> tarballs are just svn revisions with no additional changes. >> >> With this recent change, maybe out-of-tree is a better place. >> > > Which recent change ? What does "out-of-tree" exactly mean ? Recent change -> 0.10.2 will be out soon™. For the collaborative Gentoo overlay I share work with, many packages I contributed either originate there or got their first year of practice and debugging there and when I started to contribute to Guix, they started moving into Guix master. However we have some packages which can not make it into guix master in their (current) form (one example: powwow. unaltered it came into Guix, but we still patch it for Gentoo. Best case scenario would be to patch it upstream). I am testing for the best way to transition the packages which do not fit into Guix master to a form which does not depend on maintaining another Guix checkout (too many wip packages on my side, and it must mean low maintenance costs). This is what I mean with out-of-tree. > >> >> Fyi, I tried with most recent head and tests no longer fail it seems. >> > > This is one more reason to provide a package from a checkout. Maybe, maybe not. I'll see that I append a revision-less patch later today. Builds does not always mean "runs". And it still requires (for GuixSD) the service for best experience. I'm slow with that. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-02 14:09 ` ng0 @ 2016-08-02 14:57 ` Catonano 2016-08-02 15:31 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: Catonano @ 2016-08-02 14:57 UTC (permalink / raw) To: ng0; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 1164 bytes --] 2016-08-02 16:09 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > > Recent change -> 0.10.2 will be out soon™. > > > For the collaborative Gentoo overlay I share work with, many packages > I contributed either originate there or got their first year of practice > and debugging there and when I started to contribute to Guix, they > started moving into Guix master. > However we have some packages which can not make it into guix master in > their (current) form (one example: powwow. unaltered it came into Guix, > but we still patch it for Gentoo. Best case scenario would be to patch > it upstream). I am testing for the best way to transition the packages > which do not fit into Guix master to a form which does not depend on > maintaining another Guix checkout (too many wip packages on my side, and > it must mean low maintenance costs). > > This is what I mean with out-of-tree. > Thanks for your clarifications. Why don't these packages fit into Guix master ? Could you provide a list of these packages ? Someone could take the initiative to try to work on one of those and you could be lifted from the brunt Just maybe. [-- Attachment #2: Type: text/html, Size: 1611 bytes --] ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-02 14:57 ` Catonano @ 2016-08-02 15:31 ` ng0 2016-08-03 11:45 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-02 15:31 UTC (permalink / raw) To: Catonano; +Cc: guix-devel Catonano <catonano@gmail.com> writes: > 2016-08-02 16:09 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > >> >> Recent change -> 0.10.2 will be out soon™. >> >> >> For the collaborative Gentoo overlay I share work with, many packages >> I contributed either originate there or got their first year of practice >> and debugging there and when I started to contribute to Guix, they >> started moving into Guix master. >> However we have some packages which can not make it into guix master in >> their (current) form (one example: powwow. unaltered it came into Guix, >> but we still patch it for Gentoo. Best case scenario would be to patch >> it upstream). I am testing for the best way to transition the packages >> which do not fit into Guix master to a form which does not depend on >> maintaining another Guix checkout (too many wip packages on my side, and >> it must mean low maintenance costs). >> >> This is what I mean with out-of-tree. >> > > Thanks for your clarifications. > > Why don't these packages fit into Guix master ? > > Could you provide a list of these packages ? > > Someone could take the initiative to try to work on one of those and you > could be lifted from the brunt > > Just maybe. I have around 30-60 packages work in progress, not all from the overlay. You can take a look at https://we.make.ritual.n0.is/#overlays for ways to display the whole content of the Gentoo specific overlay. So far the only limitation is either specific changes which are not yet in upstream or we package all dependencies even if it is in one case shareware as a dependency, etc etc. Some are just waiting for a bugfix upstream - I identified 2 bugs in torsocks and 1 in perl, at least one torsocks and the one perl bug will be fixed in the next releases or once they are downstreamed. I have a no longer up-to-date todo list which also includes guix in the "todo.git" repository. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-02 15:31 ` ng0 @ 2016-08-03 11:45 ` ng0 2016-08-03 12:05 ` Catonano 2016-08-03 21:10 ` Andreas Enge 0 siblings, 2 replies; 29+ messages in thread From: ng0 @ 2016-08-03 11:45 UTC (permalink / raw) To: Catonano; +Cc: guix-devel I think the costs of maintaining a -svn of gnunet are too high at the moment. I'm using these two packages as a base for debugging gnunet in addition to gentoo to help work with upstream. A revision-less svn package does not work (unlike in gentoo), so my focus is at the moment to help to push towards 0.10.2 release. Afterwards I can decide wether to include it or not, and dicuss this with the proper attention. If anyone else wants to contribute to this discussion you are invited to do so. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-03 11:45 ` ng0 @ 2016-08-03 12:05 ` Catonano 2016-08-03 21:10 ` Andreas Enge 1 sibling, 0 replies; 29+ messages in thread From: Catonano @ 2016-08-03 12:05 UTC (permalink / raw) To: ng0; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 838 bytes --] 2016-08-03 13:45 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > I think the costs of maintaining a -svn of gnunet are too high at the > moment. I'm using these two packages as a base for debugging gnunet in > addition to gentoo to help work with upstream. > > A revision-less svn package does not work (unlike in gentoo), so my > focus is at the moment to help to push towards 0.10.2 release. > > Afterwards I can decide wether to include it or not, and dicuss this > with the proper attention. > If anyone else wants to contribute to this discussion you are invited > to do so. > Thank you, ng0, I will try to contribute to this discussion. Too bad, until now I had no enough time to look at the link you provided and I'm afraid I won't have time this week. But the availability of Gnunet is important for me so I will be back on this. [-- Attachment #2: Type: text/html, Size: 1252 bytes --] ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-03 11:45 ` ng0 2016-08-03 12:05 ` Catonano @ 2016-08-03 21:10 ` Andreas Enge 2016-08-06 12:54 ` ng0 1 sibling, 1 reply; 29+ messages in thread From: Andreas Enge @ 2016-08-03 21:10 UTC (permalink / raw) To: ng0; +Cc: guix-devel Hello, On Wed, Aug 03, 2016 at 11:45:56AM +0000, ng0 wrote: > I think the costs of maintaining a -svn of gnunet are too high at the > moment. I'm using these two packages as a base for debugging gnunet in > addition to gentoo to help work with upstream. > > A revision-less svn package does not work (unlike in gentoo), so my > focus is at the moment to help to push towards 0.10.2 release. that sounds like a good option, to make sure that the 0.10.2 release will work on Guix, and hopefully pass all its tests. Thanks for the work! Andreas ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-03 21:10 ` Andreas Enge @ 2016-08-06 12:54 ` ng0 2016-08-06 23:43 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-06 12:54 UTC (permalink / raw) To: Andreas Enge; +Cc: guix-devel Andreas Enge <andreas@enge.fr> writes: > Hello, > > On Wed, Aug 03, 2016 at 11:45:56AM +0000, ng0 wrote: >> I think the costs of maintaining a -svn of gnunet are too high at the >> moment. I'm using these two packages as a base for debugging gnunet in >> addition to gentoo to help work with upstream. >> >> A revision-less svn package does not work (unlike in gentoo), so my >> focus is at the moment to help to push towards 0.10.2 release. > > that sounds like a good option, to make sure that the 0.10.2 release will > work on Guix, and hopefully pass all its tests. > > Thanks for the work! > > Andreas > Update: I think I have found what causes the problem, I'll post an updated patch soon. -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-06 12:54 ` ng0 @ 2016-08-06 23:43 ` ng0 2016-08-07 8:21 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-06 23:43 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 914 bytes --] The next 2.5 days will be unpleasant for me and probably difficult to focus, but I know how to fix the 3 failing tests for us. I'll have this fixed in thex next days. Appended is the failing tests output (for me as a backup) and the combined gnunet-svn + gnunet-gtk-svn patch. As we discussed this will not be in guix at the moment and is intended as a test package to get the next release of gnunet to build on guix when it is released. There are last things I want to transition from my Gentoo package to the guix packages. I'd like to have a gnunet package with --with-experimental enabled (features: conversation etc, at least last time I read the Makefile), so this will be available out of tree when all the features are too much for master tree (or --with-experimental is considered too unstable to ship). The log attachment was too big, log can be replicated with tests enabled. Have a nice weekend. [-- Attachment #2: #("/home/ng0/src/guix/guix-gnunet/0001-gnu-Add-gnunet-svn.patch" 10 14 (face flx-highlight-face) 14 19 (face flx-highlight-face) 19 31 (face flx-highlight-face) 31 41 (face flx-highlight-face)) --] [-- Type: message/external-body, Size: 113 bytes --] [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: 0002-gnu-Add-gnunet-gtk-svn.patch --] [-- Type: text/x-patch, Size: 2395 bytes --] From 3b20856c29dc559dc046cd267428b0bd771a7efb Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Sat, 30 Jul 2016 15:04:24 +0000 Subject: [PATCH 2/3] gnu: Add gnunet-gtk-svn. * gnu/packages/gnunet.scm (gnunet-gtk-svn): New variable. --- gnu/packages/gnunet.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 25ac073..a3f34ea 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -412,3 +412,50 @@ an application for secure publication of files, it has grown to include all kinds of basic applications for the foundation of a GNU internet.") (license license:gpl3+) (home-page "https://gnunet.org/")))) + +(define-public gnunet-gtk-svn + (let ((svn-revision 37273)) + (package + (inherit gnunet-svn) + (name "gnunet-gtk-svn") + (version (package-version gnunet-svn)) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "https://gnunet.org/svn/gnunet-gtk/") + (revision svn-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1mckc5aq05wpbvb8mbm0llkhavb0j2f496l73zaapdy3ndyhai8j")))) + (arguments + `(#:configure-flags + (list "--without-libunique" + "--with-qrencode" + (string-append "--with-gnunet=" + (assoc-ref %build-inputs "gnunet-svn"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (inputs + `(("gnunet-svn" ,gnunet-svn) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gnutls" ,gnutls) + ("libgcrypt" ,libgcrypt) + ("gtk+" ,gtk+) + ("libextractor" ,libextractor) + ("glade3" ,glade3) + ("qrencode" ,qrencode))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("libglade" ,libglade) + ("autoconf" ,autoconf) + ("gnu-gettext" ,gnu-gettext) + ("automake" ,automake) + ("libtool" ,libtool))) + (synopsis "Graphical front-end tools for GNUnet") + (home-page "https://gnunet.org")))) + -- 2.9.2 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #4: 0003-further-changes-on-top-of-gnunet-svn-and-gnunet-svn-.patch --] [-- Type: text/x-patch, Size: 5572 bytes --] From 282df1603637d80946c619ebaea8598d766d7527 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Sat, 6 Aug 2016 17:54:02 +0000 Subject: [PATCH 3/3] further changes on top of gnunet-svn and gnunet-svn-gtk. --- gnu/packages/gnunet.scm | 56 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index a3f34ea..bdfd3b4 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -49,6 +49,13 @@ #:use-module (gnu packages databases) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages web) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages admin) + #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages linux) +;; #:use-module (gnu packages tex) #:use-module (gnu packages xiph) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -338,7 +345,7 @@ services.") ;; version before refactoring work towards 0.10.2 started. (define-public gnunet-svn - (let ((svn-revision 37273)) + (let ((svn-revision 37667)) (package (name "gnunet-svn") (version (string-append "0.10.1" "-1" ".svn" @@ -352,7 +359,7 @@ services.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0xn8g0mk2nl142yz4zzrj25rpnhxfvjwnfnangyx8s44xv75i2dc")))) + "1bq0qziv0l27zjrbdk3h9601dn6lhx7w3whmxwygxp2q5g4a6yxy")))) (build-system gnu-build-system) (inputs `(("glpk" ,glpk) @@ -371,7 +378,17 @@ services.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("zlib" ,zlib) - ("python" ,python-2))) ; tests and gnunet-qr + ("perl" ,perl) + ("python" ,python-2) ; tests and gnunet-qr + ("jansson" ,jansson) + ("ncurses" ,ncurses) + ("nss" ,nss) + ("gmp" ,gmp) + ("bluez" ,bluez) ; for optional bluetooth feature + ;; ("udpcast" ,udpcast) ; optional. + ("glib" ,glib) + ;; ("texlive-minimal" ,texlive-minimal) ; optional. + ("libogg" ,libogg))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) @@ -380,7 +397,8 @@ services.") ("libtool" ,libtool))) (arguments '(#:configure-flags - (list (string-append "--with-nssdir=" %output "/lib")) + (list (string-append "--with-nssdir=" %output "/lib") + "--enable-experimental") #:parallel-tests? #f ; parallel building is not functional #:tests? #f ; FAIL: test_testbed_logger_api #:phases @@ -397,11 +415,26 @@ services.") (lambda _ (zero? (system* "sh" "bootstrap")))) - (add-before 'check 'set-path-for-check - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "GNUNET_PREFIX" (string-append out "/lib")) - (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")))))))) + ;; DISABLED until failing testcases are fixed. + ;; this test fails in our environment, disable it: + ;; XXX: specify which ones fail. + ;; (add-after 'patch-bin-sh 'disable-test_quota_compliance_tcp_asymmetric + ;; (lambda _ + ;; (substitute* '("src/transport/Makefile.am") + ;; (("test_quota_compliance_tcp_asymmetric") "")))) + ;; (("test_quota_compliance_http_asymmetric") "") + ;; (("test_quota_compliance_https_asymmetric") "") + ;; (("test_quota_compliance_unix") "") + ;; (("test_quota_compliance_unix_asymmetric") "")))) + ;; check is between build and install, fix this to: + ;; build - install - check, else the test suite fails. + ;; (delete 'check) + ;; (add-after 'install 'set-path-for-check + ;; (lambda* (#:key outputs #:allow-other-keys) + ;; (let ((out (assoc-ref outputs "out"))) + ;; (setenv "GNUNET_PREFIX" (string-append out "/lib")) + ;; (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))) + ;; (zero? (system* "make" "check"))))))) (synopsis "Secure, decentralized, peer-to-peer networking framework") (description "GNUnet is a framework for secure peer-to-peer networking. The @@ -414,7 +447,7 @@ kinds of basic applications for the foundation of a GNU internet.") (home-page "https://gnunet.org/")))) (define-public gnunet-gtk-svn - (let ((svn-revision 37273)) + (let ((svn-revision 37667)) (package (inherit gnunet-svn) (name "gnunet-gtk-svn") @@ -428,7 +461,7 @@ kinds of basic applications for the foundation of a GNU internet.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1mckc5aq05wpbvb8mbm0llkhavb0j2f496l73zaapdy3ndyhai8j")))) + "0xm95ac47h00c248g3g8h4smjyzx6yzdlra5kgdnymsl4zymmh3l")))) (arguments `(#:configure-flags (list "--without-libunique" @@ -458,4 +491,3 @@ kinds of basic applications for the foundation of a GNU internet.") ("libtool" ,libtool))) (synopsis "Graphical front-end tools for GNUnet") (home-page "https://gnunet.org")))) - -- 2.9.2 [-- Attachment #5: Type: text/plain, Size: 129 bytes --] -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-06 23:43 ` ng0 @ 2016-08-07 8:21 ` ng0 2016-08-18 13:27 ` Catonano 2016-08-19 7:13 ` Alex Kost 0 siblings, 2 replies; 29+ messages in thread From: ng0 @ 2016-08-07 8:21 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 1063 bytes --] ng0 <ng0@we.make.ritual.n0.is> writes: > The next 2.5 days will be unpleasant for me and probably difficult to > focus, but I know how to fix the 3 failing tests for us. > I'll have this fixed in thex next days. > > Appended is the failing tests output (for me as a backup) and the > combined gnunet-svn + gnunet-gtk-svn patch. As we discussed this will > not be in guix at the moment and is intended as a test package to get > the next release of gnunet to build on guix when it is released. > > There are last things I want to transition from my Gentoo package to the > guix packages. > > I'd like to have a gnunet package with --with-experimental enabled > (features: conversation etc, at least last time I read the Makefile), so > this will be available out of tree when all the features are too much > for master tree (or --with-experimental is considered too unstable to > ship). > > The log attachment was too big, log can be replicated with tests > enabled. > > Have a nice weekend. For whatever reason the appended patches broke, here is another try: [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-Add-gnunet-svn.patch --] [-- Type: text/x-patch, Size: 4359 bytes --] From c1e673b06506ebfd476ccd248a6f00e18c4d22c1 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Sat, 30 Jul 2016 14:09:31 +0000 Subject: [PATCH 1/3] gnu: Add gnunet-svn. * gnu/packages/gnunet.scm (gnunet-svn): New variable. --- gnu/packages/gnunet.scm | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 4d888bd..25ac073 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -54,6 +54,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix build-system gnu)) (define-public libextractor @@ -330,3 +331,84 @@ services.") `(("pkg-config" ,pkg-config) ("libglade" ,libglade))) (synopsis "Graphical front-end tools for GNUnet"))) + +;; gnunet-fs 0.9, 0.10.1 and HEAD are incompatible to each other as +;; explained here https://gnunet.org/bot/log/gnunet/2016-06-23#T1067897 +;; We use a revision of a proven and confirmed to be usable and stable +;; version before refactoring work towards 0.10.2 started. + +(define-public gnunet-svn + (let ((svn-revision 37273)) + (package + (name "gnunet-svn") + (version (string-append "0.10.1" "-1" ".svn" + (number->string svn-revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "https://gnunet.org/svn/gnunet/") + (revision svn-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0xn8g0mk2nl142yz4zzrj25rpnhxfvjwnfnangyx8s44xv75i2dc")))) + (build-system gnu-build-system) + (inputs + `(("glpk" ,glpk) + ("gnurl" ,gnurl) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("gnutls" ,gnutls) + ("libextractor" ,libextractor) + ("libgcrypt" ,libgcrypt) + ("libidn" ,libidn) + ("libmicrohttpd" ,libmicrohttpd) + ("libltdl" ,libltdl) + ("libunistring" ,libunistring) + ("openssl" ,openssl) + ("opus" ,opus) + ("pulseaudio" ,pulseaudio) + ("sqlite" ,sqlite) + ("zlib" ,zlib) + ("python" ,python-2))) ; tests and gnunet-qr + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("gnu-gettext" ,gnu-gettext) + ("libtool" ,libtool))) + (arguments + '(#:configure-flags + (list (string-append "--with-nssdir=" %output "/lib")) + #:parallel-tests? #f ; parallel building is not functional + #:tests? #f ; FAIL: test_testbed_logger_api + #:phases + ;; swap check and install phases and set paths to installed bin + (modify-phases %standard-phases + (add-after 'unpack 'patch-bin-sh + (lambda _ + (and + (substitute* '("bootstrap") + (("contrib/pogen.sh") "sh contrib/pogen.sh")) + (for-each (lambda (f) (chmod f #o755)) + (find-files "po" ""))))) + (add-after 'patch-bin-sh 'bootstrap + (lambda _ + (zero? + (system* "sh" "bootstrap")))) + (add-before 'check 'set-path-for-check + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "GNUNET_PREFIX" (string-append out "/lib")) + (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")))))))) + (synopsis "Secure, decentralized, peer-to-peer networking framework") + (description + "GNUnet is a framework for secure peer-to-peer networking. The +high-level goal is to provide a strong foundation of free software for a +global, distributed network that provides security and privacy. GNUnet in +that sense aims to replace the current internet protocol stack. Along with +an application for secure publication of files, it has grown to include all +kinds of basic applications for the foundation of a GNU internet.") + (license license:gpl3+) + (home-page "https://gnunet.org/")))) -- 2.9.2 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: 0002-gnu-Add-gnunet-gtk-svn.patch --] [-- Type: text/x-patch, Size: 2395 bytes --] From 3b20856c29dc559dc046cd267428b0bd771a7efb Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Sat, 30 Jul 2016 15:04:24 +0000 Subject: [PATCH 2/3] gnu: Add gnunet-gtk-svn. * gnu/packages/gnunet.scm (gnunet-gtk-svn): New variable. --- gnu/packages/gnunet.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 25ac073..a3f34ea 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -412,3 +412,50 @@ an application for secure publication of files, it has grown to include all kinds of basic applications for the foundation of a GNU internet.") (license license:gpl3+) (home-page "https://gnunet.org/")))) + +(define-public gnunet-gtk-svn + (let ((svn-revision 37273)) + (package + (inherit gnunet-svn) + (name "gnunet-gtk-svn") + (version (package-version gnunet-svn)) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "https://gnunet.org/svn/gnunet-gtk/") + (revision svn-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1mckc5aq05wpbvb8mbm0llkhavb0j2f496l73zaapdy3ndyhai8j")))) + (arguments + `(#:configure-flags + (list "--without-libunique" + "--with-qrencode" + (string-append "--with-gnunet=" + (assoc-ref %build-inputs "gnunet-svn"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (inputs + `(("gnunet-svn" ,gnunet-svn) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gnutls" ,gnutls) + ("libgcrypt" ,libgcrypt) + ("gtk+" ,gtk+) + ("libextractor" ,libextractor) + ("glade3" ,glade3) + ("qrencode" ,qrencode))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("libglade" ,libglade) + ("autoconf" ,autoconf) + ("gnu-gettext" ,gnu-gettext) + ("automake" ,automake) + ("libtool" ,libtool))) + (synopsis "Graphical front-end tools for GNUnet") + (home-page "https://gnunet.org")))) + -- 2.9.2 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #4: 0003-further-changes-on-top-of-gnunet-svn-and-gnunet-svn-.patch --] [-- Type: text/x-patch, Size: 5572 bytes --] From 282df1603637d80946c619ebaea8598d766d7527 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Sat, 6 Aug 2016 17:54:02 +0000 Subject: [PATCH 3/3] further changes on top of gnunet-svn and gnunet-svn-gtk. --- gnu/packages/gnunet.scm | 56 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index a3f34ea..bdfd3b4 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -49,6 +49,13 @@ #:use-module (gnu packages databases) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages web) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages admin) + #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages linux) +;; #:use-module (gnu packages tex) #:use-module (gnu packages xiph) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -338,7 +345,7 @@ services.") ;; version before refactoring work towards 0.10.2 started. (define-public gnunet-svn - (let ((svn-revision 37273)) + (let ((svn-revision 37667)) (package (name "gnunet-svn") (version (string-append "0.10.1" "-1" ".svn" @@ -352,7 +359,7 @@ services.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0xn8g0mk2nl142yz4zzrj25rpnhxfvjwnfnangyx8s44xv75i2dc")))) + "1bq0qziv0l27zjrbdk3h9601dn6lhx7w3whmxwygxp2q5g4a6yxy")))) (build-system gnu-build-system) (inputs `(("glpk" ,glpk) @@ -371,7 +378,17 @@ services.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("zlib" ,zlib) - ("python" ,python-2))) ; tests and gnunet-qr + ("perl" ,perl) + ("python" ,python-2) ; tests and gnunet-qr + ("jansson" ,jansson) + ("ncurses" ,ncurses) + ("nss" ,nss) + ("gmp" ,gmp) + ("bluez" ,bluez) ; for optional bluetooth feature + ;; ("udpcast" ,udpcast) ; optional. + ("glib" ,glib) + ;; ("texlive-minimal" ,texlive-minimal) ; optional. + ("libogg" ,libogg))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) @@ -380,7 +397,8 @@ services.") ("libtool" ,libtool))) (arguments '(#:configure-flags - (list (string-append "--with-nssdir=" %output "/lib")) + (list (string-append "--with-nssdir=" %output "/lib") + "--enable-experimental") #:parallel-tests? #f ; parallel building is not functional #:tests? #f ; FAIL: test_testbed_logger_api #:phases @@ -397,11 +415,26 @@ services.") (lambda _ (zero? (system* "sh" "bootstrap")))) - (add-before 'check 'set-path-for-check - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "GNUNET_PREFIX" (string-append out "/lib")) - (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")))))))) + ;; DISABLED until failing testcases are fixed. + ;; this test fails in our environment, disable it: + ;; XXX: specify which ones fail. + ;; (add-after 'patch-bin-sh 'disable-test_quota_compliance_tcp_asymmetric + ;; (lambda _ + ;; (substitute* '("src/transport/Makefile.am") + ;; (("test_quota_compliance_tcp_asymmetric") "")))) + ;; (("test_quota_compliance_http_asymmetric") "") + ;; (("test_quota_compliance_https_asymmetric") "") + ;; (("test_quota_compliance_unix") "") + ;; (("test_quota_compliance_unix_asymmetric") "")))) + ;; check is between build and install, fix this to: + ;; build - install - check, else the test suite fails. + ;; (delete 'check) + ;; (add-after 'install 'set-path-for-check + ;; (lambda* (#:key outputs #:allow-other-keys) + ;; (let ((out (assoc-ref outputs "out"))) + ;; (setenv "GNUNET_PREFIX" (string-append out "/lib")) + ;; (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))) + ;; (zero? (system* "make" "check"))))))) (synopsis "Secure, decentralized, peer-to-peer networking framework") (description "GNUnet is a framework for secure peer-to-peer networking. The @@ -414,7 +447,7 @@ kinds of basic applications for the foundation of a GNU internet.") (home-page "https://gnunet.org/")))) (define-public gnunet-gtk-svn - (let ((svn-revision 37273)) + (let ((svn-revision 37667)) (package (inherit gnunet-svn) (name "gnunet-gtk-svn") @@ -428,7 +461,7 @@ kinds of basic applications for the foundation of a GNU internet.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1mckc5aq05wpbvb8mbm0llkhavb0j2f496l73zaapdy3ndyhai8j")))) + "0xm95ac47h00c248g3g8h4smjyzx6yzdlra5kgdnymsl4zymmh3l")))) (arguments `(#:configure-flags (list "--without-libunique" @@ -458,4 +491,3 @@ kinds of basic applications for the foundation of a GNU internet.") ("libtool" ,libtool))) (synopsis "Graphical front-end tools for GNUnet") (home-page "https://gnunet.org")))) - -- 2.9.2 [-- Attachment #5: Type: text/plain, Size: 130 bytes --] -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-07 8:21 ` ng0 @ 2016-08-18 13:27 ` Catonano 2016-08-18 14:15 ` ng0 2016-08-20 11:17 ` ng0 2016-08-19 7:13 ` Alex Kost 1 sibling, 2 replies; 29+ messages in thread From: Catonano @ 2016-08-18 13:27 UTC (permalink / raw) To: ng0; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 3361 bytes --] 2016-08-07 10:21 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > ng0 <ng0@we.make.ritual.n0.is> writes: > > > The next 2.5 days will be unpleasant for me and probably difficult to > > focus, but I know how to fix the 3 failing tests for us. > > I'll have this fixed in thex next days. > > > > Appended is the failing tests output (for me as a backup) and the > > combined gnunet-svn + gnunet-gtk-svn patch. As we discussed this will > > not be in guix at the moment and is intended as a test package to get > > the next release of gnunet to build on guix when it is released. > > > > There are last things I want to transition from my Gentoo package to the > > guix packages. > > > > I'd like to have a gnunet package with --with-experimental enabled > > (features: conversation etc, at least last time I read the Makefile), so > > this will be available out of tree when all the features are too much > > for master tree (or --with-experimental is considered too unstable to > > ship). > > > > The log attachment was too big, log can be replicated with tests > > enabled. > > > > Have a nice weekend. > > For whatever reason the appended patches broke, here is another try: > > > > > I'd like to put down a few notes gnunet-gtk-svn First: there are these 3 warnings in the terminal ago 17 15:02:04-825169 util-28635 WARNING `access' failed on file `/gnu/store/icrh1m4dcjpxm0j9d986sdhwnc5nj92b-gnunet-gtk-svn- 0.10.1-1.svn37273/gnunet/libexec/gnunet-service-resolver' at os_installation.c:867 with error: File o directory non esistente ago 17 15:02:04-825285 util-28635 WARNING `access' failed on file `/gnu/store/icrh1m4dcjpxm0j9d986sdhwnc5nj92b-gnunet-gtk-svn- 0.10.1-1.svn37273/gnunet/libexec/gnunet-service-namestore' at os_installation.c:867 with error: File o directory non esistente ago 17 15:02:04-825303 util-28635 WARNING `access' failed on file `/gnu/store/icrh1m4dcjpxm0j9d986sdhwnc5nj92b-gnunet-gtk-svn- 0.10.1-1.svn37273/gnunet/libexec/gnunet-service-identity' at os_installation.c:867 with error: File o directory non esistente an "ls" in that directory shows ls /gnu/store/icrh1m4dcjpxm0j9d986sdhwnc5nj92b-gnunet-gtk-svn- 0.10.1-1.svn37273/ bin include lib share There's no gnunet/libexec But wait there's more: a ls in the gnunet-svn package (that's a dependency of gnunet-gtk-svn) shows ls /gnu/store/15r69amj11df3v9ka2kzsw62ad866ii7-gnunet-svn-0.10.1-1.svn37273/ bin include lib share There's no libexec here, either Next issue: in the setup window, there's a tab containing some ceckboxes for the transport plugins that I should check to activate a tranport plugin. But when I open the tab these errors show up in the terminal: ago 17 15:02:08-145220 gnunet-setup-28635 ERROR Configuration fails to specify option `PLUGINS' in section `transport'! ago 17 15:02:08-147950 gnunet-setup-28635 ERROR Configuration fails to specify option `PLUGINS' in section `transport'! ago 17 15:02:08-148828 gnunet-setup-28635 ERROR Configuration fails to specify option `PLUGINS' in section `transport'! ago 17 15:02:08-149459 gnunet-setup-28635 ERROR Configuration fails to specify option `PLUGINS' in section `transport'! ago 17 15:02:08-150018 gnunet-setup-28635 ERROR Configuration fails to specify option `PLUGINS' in section `transport'! and the checkboxes don't react to my clicks so I can't activate any transport layer. [-- Attachment #2: Type: text/html, Size: 4442 bytes --] ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-18 13:27 ` Catonano @ 2016-08-18 14:15 ` ng0 2016-08-20 11:17 ` ng0 1 sibling, 0 replies; 29+ messages in thread From: ng0 @ 2016-08-18 14:15 UTC (permalink / raw) To: Catonano; +Cc: guix-devel Catonano <catonano@gmail.com> writes: > 2016-08-07 10:21 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is>: > >> ng0 <ng0@we.make.ritual.n0.is> writes: >> >> > The next 2.5 days will be unpleasant for me and probably difficult to >> > focus, but I know how to fix the 3 failing tests for us. >> > I'll have this fixed in thex next days. >> > >> > Appended is the failing tests output (for me as a backup) and the >> > combined gnunet-svn + gnunet-gtk-svn patch. As we discussed this will >> > not be in guix at the moment and is intended as a test package to get >> > the next release of gnunet to build on guix when it is released. >> > >> > There are last things I want to transition from my Gentoo package to the >> > guix packages. >> > >> > I'd like to have a gnunet package with --with-experimental enabled >> > (features: conversation etc, at least last time I read the Makefile), so >> > this will be available out of tree when all the features are too much >> > for master tree (or --with-experimental is considered too unstable to >> > ship). >> > >> > The log attachment was too big, log can be replicated with tests >> > enabled. >> > >> > Have a nice weekend. >> >> For whatever reason the appended patches broke, here is another try: >> >> >> >> >> > > I'd like to put down a few notes gnunet-gtk-svn > > First: there are these 3 warnings in the terminal > > ago 17 15:02:04-825169 util-28635 WARNING `access' failed on file > `/gnu/store/icrh1m4dcjpxm0j9d986sdhwnc5nj92b-gnunet-gtk-svn- > 0.10.1-1.svn37273/gnunet/libexec/gnunet-service-resolver' at > os_installation.c:867 with error: File o directory non esistente > > ago 17 15:02:04-825285 util-28635 WARNING `access' failed on file > `/gnu/store/icrh1m4dcjpxm0j9d986sdhwnc5nj92b-gnunet-gtk-svn- > 0.10.1-1.svn37273/gnunet/libexec/gnunet-service-namestore' at > os_installation.c:867 with error: File o directory non esistente > > ago 17 15:02:04-825303 util-28635 WARNING `access' failed on file > `/gnu/store/icrh1m4dcjpxm0j9d986sdhwnc5nj92b-gnunet-gtk-svn- > 0.10.1-1.svn37273/gnunet/libexec/gnunet-service-identity' at > os_installation.c:867 with error: File o directory non esistente > > an "ls" in that directory shows > > ls /gnu/store/icrh1m4dcjpxm0j9d986sdhwnc5nj92b-gnunet-gtk-svn- > 0.10.1-1.svn37273/ > bin include lib share > > There's no gnunet/libexec > > But wait there's more: a ls in the gnunet-svn package (that's a dependency > of gnunet-gtk-svn) shows > > ls /gnu/store/15r69amj11df3v9ka2kzsw62ad866ii7-gnunet-svn-0.10.1-1.svn37273/ > bin include lib share > > There's no libexec here, either > > > > > > Next issue: in the setup window, there's a tab containing some ceckboxes > for the transport plugins that I should check to activate a tranport plugin. > > But when I open the tab these errors show up in the terminal: > > ago 17 15:02:08-145220 gnunet-setup-28635 ERROR Configuration fails to > specify option `PLUGINS' in section `transport'! > > ago 17 15:02:08-147950 gnunet-setup-28635 ERROR Configuration fails to > specify option `PLUGINS' in section `transport'! > > ago 17 15:02:08-148828 gnunet-setup-28635 ERROR Configuration fails to > specify option `PLUGINS' in section `transport'! > > ago 17 15:02:08-149459 gnunet-setup-28635 ERROR Configuration fails to > specify option `PLUGINS' in section `transport'! > > ago 17 15:02:08-150018 gnunet-setup-28635 ERROR Configuration fails to > specify option `PLUGINS' in section `transport'! > > > and the checkboxes don't react to my clicks so I can't activate any > transport layer. Sorry to have such a short answer, but please refer to upstream for bug solving with this version (https://gnunet.org/bugs/). Depending on which svn revision you use, the bugs may already be gone. That's 37273, HEAD is currently at 37733. -- ng0 For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-18 13:27 ` Catonano 2016-08-18 14:15 ` ng0 @ 2016-08-20 11:17 ` ng0 2016-08-20 12:04 ` ng0 1 sibling, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-20 11:17 UTC (permalink / raw) To: Catonano; +Cc: guix-devel In case you are interested here is current (37742): ============================================================================ Testsuite summary for gnunet 0.10.1 ============================================================================ # TOTAL: 63 # PASS: 55 # SKIP: 4 # XFAIL: 0 # FAIL: 4 # XPASS: 0 # ERROR: 0 ============================================================================ See src/transport/test-suite.log Please report to bug-gnunet@gnu.org ============================================================================ 13 MiB log file: https://dl.n0.is/debug/gnunet/logs/37742/2016-08-20/guixsd-gnunet-svn-1100UTC-test-suite.log https://dl.far37qbrwiredyo5.onion/debug/gnunet/logs/37742/2016-08-20/guixsd-gnunet-svn-1100UTC-test-suite.log I will open a bug on this now to figure out how I can patch it in guix. I do not understand enough of gnunet testsuite to answer this question myself at the moment. DK* is no remote gnunet peerid, so I have to ask how these tests work. -- ng0 For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-20 11:17 ` ng0 @ 2016-08-20 12:04 ` ng0 2016-08-27 0:06 ` Catonano 0 siblings, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-20 12:04 UTC (permalink / raw) To: Catonano; +Cc: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > In case you are interested here is current (37742): > > ============================================================================ > Testsuite summary for gnunet 0.10.1 > ============================================================================ > # TOTAL: 63 > # PASS: 55 > # SKIP: 4 > # XFAIL: 0 > # FAIL: 4 > # XPASS: 0 > # ERROR: 0 > ============================================================================ > See src/transport/test-suite.log > Please report to bug-gnunet@gnu.org > ============================================================================ > > 13 MiB log file: > https://dl.n0.is/debug/gnunet/logs/37742/2016-08-20/guixsd-gnunet-svn-1100UTC-test-suite.log > https://dl.far37qbrwiredyo5.onion/debug/gnunet/logs/37742/2016-08-20/guixsd-gnunet-svn-1100UTC-test-suite.log > > I will open a bug on this now to figure out how I can patch it in guix. > > I do not understand enough of gnunet testsuite to answer this question > myself at the moment. > > DK* is no remote gnunet peerid, so I have to ask how these tests work. Reported at https://gnunet.org/bugs/view.php?id=4619 -- ng0 For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-20 12:04 ` ng0 @ 2016-08-27 0:06 ` Catonano 2016-08-27 13:20 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: Catonano @ 2016-08-27 0:06 UTC (permalink / raw) To: ng0; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 313 bytes --] 2016-08-20 14:04 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is> > Reported at https://gnunet.org/bugs/view.php?id=4619 > > Christian Grothoff replied that he would like you to extract a stacktrace from a core dump. Did you notice ? I would attempt that myself but admittedly I don't know how to obtain a core dump [-- Attachment #2: Type: text/html, Size: 854 bytes --] ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-27 0:06 ` Catonano @ 2016-08-27 13:20 ` ng0 0 siblings, 0 replies; 29+ messages in thread From: ng0 @ 2016-08-27 13:20 UTC (permalink / raw) To: Catonano; +Cc: guix-devel Hi, Catonano <catonano@gmail.com> writes: > 2016-08-20 14:04 GMT+02:00 ng0 <ng0@we.make.ritual.n0.is> > > > >> Reported at https://gnunet.org/bugs/view.php?id=4619 >> >> > Christian Grothoff replied that he would like you to extract a stacktrace > from a core dump. > > Did you notice ? > > I would attempt that myself but admittedly I don't know how to obtain a > core dump Yes I noticed it. I follow my bugtickets but often I'm just occupied with multiple things at the same time to reply in time. I wanted to produce this today or at the beginning of next week. Thanks -- ng0 For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-07 8:21 ` ng0 2016-08-18 13:27 ` Catonano @ 2016-08-19 7:13 ` Alex Kost 2016-08-19 7:42 ` ng0 1 sibling, 1 reply; 29+ messages in thread From: Alex Kost @ 2016-08-19 7:13 UTC (permalink / raw) To: ng0; +Cc: guix-devel ng0 (2016-08-07 11:21 +0300) wrote: [...] > + (arguments > + '(#:configure-flags > + (list (string-append "--with-nssdir=" %output "/lib")) > + #:parallel-tests? #f ; parallel building is not functional > + #:tests? #f ; FAIL: test_testbed_logger_api > + #:phases > + ;; swap check and install phases and set paths to installed bin > + (modify-phases %standard-phases > + (add-after 'unpack 'patch-bin-sh > + (lambda _ > + (and > + (substitute* '("bootstrap") I think there is no point to use list here as it is a single file. > + (("contrib/pogen.sh") "sh contrib/pogen.sh")) > + (for-each (lambda (f) (chmod f #o755)) > + (find-files "po" ""))))) 'and' shouldn't be used in this phase as both 'substitute*' and 'for-each' do not specify the returned value, so: (lambda _ (substitute* "bootstrap" (("contrib/pogen.sh") "sh contrib/pogen.sh")) (for-each (lambda (f) (chmod f #o755)) (find-files "po" "")) #t) I didn't build this package, I was just passing by and noticed those small things. I hope someone else will review and commit this patch :-) -- Alex ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-19 7:13 ` Alex Kost @ 2016-08-19 7:42 ` ng0 2016-08-25 11:36 ` ng0 0 siblings, 1 reply; 29+ messages in thread From: ng0 @ 2016-08-19 7:42 UTC (permalink / raw) To: Alex Kost; +Cc: guix-devel Alex Kost <alezost@gmail.com> writes: > ng0 (2016-08-07 11:21 +0300) wrote: > > [...] >> + (arguments >> + '(#:configure-flags >> + (list (string-append "--with-nssdir=" %output "/lib")) >> + #:parallel-tests? #f ; parallel building is not functional >> + #:tests? #f ; FAIL: test_testbed_logger_api >> + #:phases >> + ;; swap check and install phases and set paths to installed bin >> + (modify-phases %standard-phases >> + (add-after 'unpack 'patch-bin-sh >> + (lambda _ >> + (and >> + (substitute* '("bootstrap") > > I think there is no point to use list here as it is a single file. > >> + (("contrib/pogen.sh") "sh contrib/pogen.sh")) >> + (for-each (lambda (f) (chmod f #o755)) >> + (find-files "po" ""))))) > > 'and' shouldn't be used in this phase as both 'substitute*' and > 'for-each' do not specify the returned value, so: > > (lambda _ > (substitute* "bootstrap" > (("contrib/pogen.sh") "sh contrib/pogen.sh")) > (for-each (lambda (f) (chmod f #o755)) > (find-files "po" "")) > #t) > Thanks. I will adjust this in my out-of-tree package (currently this goes into the work in progress guix.scm and nix.default for a project I package for). This part of the package you reviewed was not my original work, but I take the blame for I did not check it all. > I didn't build this package, I was just passing by and noticed those > small things. I hope someone else will review and commit this patch :-) > > -- > Alex It depends: This is a base for the soon to be released gnunet-0.10.2, but Christian said that months after the release of 0.10.2 there needs to happen another compability break, so I will keep -svn maintained as it is in my personal interest for secushare. At least one person is interested in this, if there's no rejection this could be kept around in master, while I/we check that the revision used actually works. GNUnet svn was never broken for me, only recently with the refactoring it became a problem. -- ng0 For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] gnunet-svn, gnunet-gtk-svn 2016-08-19 7:42 ` ng0 @ 2016-08-25 11:36 ` ng0 0 siblings, 0 replies; 29+ messages in thread From: ng0 @ 2016-08-25 11:36 UTC (permalink / raw) To: guix-devel Development of these -svn packages has been moved into guixpkgs, which currently is a repository in early stages will be fixed up soon, created for packages around psyced and ultimately the secushare development prototypes. This repository will also see some of the ebuild->guix package transition I am doing for a long time now. I quote myself: For tor/onion access take a look at tor.n0.is. Nixpkgs and Guixpkgs, including the packages for SecuShare, GNUnet, psyced, libpsyc, psyclpc, and more. These two repositories are transitioning work and will be functional in the near future. For Nix, use: git://git.far37qbrwiredyo5.onion/nixpkgs.git https://git.n0.is/nixpkgs.git git://git.n0.is/nixpkgs.git And for Guix use: git://git.far37qbrwiredyo5.onion/guixpkgs.git https://git.n0.is/guixpkgs.git git://git.n0.is/guixpkgs.git -- ng0 For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2016-08-27 13:20 UTC | newest] Thread overview: 29+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-07-30 15:11 [PATCH] gnunet-svn, gnunet-gtk-svn ng0 2016-07-30 15:41 ` ng0 2016-07-30 15:56 ` ng0 2016-07-31 13:08 ` ng0 2016-08-01 14:34 ` ng0 2016-08-01 19:01 ` Catonano 2016-08-01 19:42 ` ng0 2016-08-01 22:21 ` Andreas Enge 2016-08-02 8:27 ` ng0 2016-08-02 10:30 ` ng0 2016-08-02 13:05 ` Catonano 2016-08-02 14:09 ` ng0 2016-08-02 14:57 ` Catonano 2016-08-02 15:31 ` ng0 2016-08-03 11:45 ` ng0 2016-08-03 12:05 ` Catonano 2016-08-03 21:10 ` Andreas Enge 2016-08-06 12:54 ` ng0 2016-08-06 23:43 ` ng0 2016-08-07 8:21 ` ng0 2016-08-18 13:27 ` Catonano 2016-08-18 14:15 ` ng0 2016-08-20 11:17 ` ng0 2016-08-20 12:04 ` ng0 2016-08-27 0:06 ` Catonano 2016-08-27 13:20 ` ng0 2016-08-19 7:13 ` Alex Kost 2016-08-19 7:42 ` ng0 2016-08-25 11:36 ` ng0
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).