Re: [PATCH 2/2] gnu: python: Add i3-quickswitch.

[Leo Famulari]

On Wed, Sep 14, 2016 at 11:17:24AM +0200, Ivan Vilata i Balaguer wrote:
> Subject: [PATCH 2/2] gnu: python: Add i3-quickswitch.
> 
> * gnu/packages/python.scm (i3-quickswitch): New variable.

Cool, this works :)

> +(define-public i3-quickswitch
> +  (package
> +(name "i3-quickswitch")

Again, I think that we should stay closer to the upstream name, in this
case "quickswitch-for-i3".

> +(build-system python-build-system)

Also again, it would be nice to include README.rst.


signature.asc
Description: PGP signature

Re: [PATCH 0/2] Add quickswitch for i3

[Leo Famulari]

On Wed, Sep 14, 2016 at 11:12:29AM +0200, Ivan Vilata i Balaguer wrote:
> Hi everyone,

Hi!

> The following two patches add the [quickswitch for i3][] package.  It
> depends on [i3-py][], which I renamed to ``python-i3``.  The quickswitch
> package is named ``i3-quickswitch``.  I hope I got the naming right,
> they're also the first packages I add to Guix, so please tell if I did
> something wrong!`:)`

Generally, we stick to the upstream name, except for the case of Python
Perl modules... and a few other cases. User facing applications like
quickswitch typically keep their upstream names. There's some more info
in the manual, section 7.6.2 Package Naming:

https://www.gnu.org/software/guix/manual/html_node/Package-Naming.html


signature.asc
Description: PGP signature

Re: [PATCH 1/2] gnu: python: Add python-i3.

[Leo Famulari]

On Wed, Sep 14, 2016 at 11:16:38AM +0200, Ivan Vilata i Balaguer wrote:
> Subject: [PATCH 1/2] gnu: python: Add python-i3.
> 
> * gnu/packages/python.scm (python-i3, python2-i3): New variables.

Thank you for this patch!

> +(define-public python-i3
> +  (package
> +(name "python-i3")

I think the package should be named python-i3-py because this will be
less confusing for anyone looking for i3-py.

> +(version "0.6.4")

As Brendan pointed out, there is a later version in the Git repo.
Although we prefer to fetch from PyPi when all else is equal, we should
package the latest version available. There is an example of packaging
from Git when there is a version number but no tags in the darkhttpd
package definition.

> +(build-system python-build-system)

Also, it would be nice to include the README.md in
'share/doc/python-i3-py', since there's no other documentation. This can
be done in a build phase after the install phase. Please reply here or
ask on #guix on Freenode if you get stuck.


signature.asc
Description: PGP signature

Re: [PATCH] Clean all .go in clean-go

[Eric Bavier]

On Fri, 02 Sep 2016 14:42:27 +0200
l...@gnu.org (Ludovic Courtès) wrote:

> Eric Bavier  skribis:
> 
> > On Thu, 01 Sep 2016 14:37:58 +0200
> > l...@gnu.org (Ludovic Courtès) wrote:  
> 
> [...]
> 
> >> > In regards of the .go files remaining in the build directory, I agree
> >> > that this is not good, however I don't think it is worth trying to fix
> >> > this issue which equally applies to every file generated by Make.  Using
> >> > wildcards can be tempting in such cases but it can lead to accidental
> >> > file deletions which is worse IMO.  As a consequence I would prefer
> >> > keeping the current 'clean-go' rule.
> >> 
> >> I sympathize with that.  
> >
> > How about simply printing  a warning if there are any .go files laying
> > around after a `make clean` or `make clean-go`?  
> 
> Sure, why not.

So, with the attached patch, I get the following output after `make
clean-go`:

warning: stray .go files: ./guix/scripts/import/cpan.go ./gnu/services/dmd.go
./gnu/system/linux.go ./gnu/packages/yasm.go ./gnu/packages/cursynth.go 
./gnu/packages/lightning.go ./gnu/packages/doxygen.go ./gnu/packages/tre.go 
./gnu/packages/asciidoc.go ./gnu/packages/texlive.go ./gnu/packages/i3.go 
./gnu/packages/fish.go ./gnu/packages/slim.go ./gnu/packages/tcsh.go 
./gnu/packages/zsh.go ./gnu/packages/lsh.go ./gnu/packages/rc.go 
./gnu/packages/openssl.go ./gnu/packages/aria2.go ./gnu/packages/gdbm.go 
./gnu/packages/gnutls.go ./gnu/packages/grue-hunter.go 
./gnu/packages/aarddict.go

Maybe this means that I've not been doing due diligence in keeping my
builddir clean, or maybe its just the result of developing on guix for
so long.

Another issue that I thought of that's posed by these stray .go files,
which isn't only a problem when acting as a wizard: introducing a new
module import when adding a package, only to have that module
moved/renamed before pushing your change.  I suppose it is a corner
case, but it did happen to me recently, in 2e3f18511, which 宋文武
kindly fixed in 19b2ea1b6. The problem was that between the time I
originally packaged tomb and the time I pushed the commit,
gnu/packages/zsh.scm was consolidated into gnu/packages/shells.scm.  I
had done a `make clean-go && make` before pushing, as I always do, but
since clean-go didn't remove gnu/packages/zsh.go the subsequent `make`
didn't complain of a missing module.

`~Eric
From ffe1710d5a91cd9906f2419d21944b1375b1b842 Mon Sep 17 00:00:00 2001
From: Eric Bavier 
Date: Thu, 15 Sep 2016 23:31:41 -0500
Subject: [PATCH] build: clean-go: warn about stray .go files.

* Makefile.am (clean-go): Warn of .go files remaining in builddir.
---
 Makefile.am | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index f9fe141..43a33c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -208,6 +208,12 @@ endif INSTALL_SRFI_37
 # Handy way to remove the .go files without removing all the rest.
 clean-go:
 	-$(RM) -f $(GOBJECTS)
+	@find . -name '*.go' -print | \
+	  if test -t 1; then \
+	xargs -r echo -e "\033[31mwarning:\033[0m stray .go files:"; \
+	  else \
+	xargs -r echo "warning: stray .go files:"; \
+	  fi
 
 
 # Test extensions; has to be unconditional.
-- 
2.9.2

Re: [PATCH 02/12] import: utils: Symbols from 'license->symbol' have a license: prefix.

[Eric Bavier]

On Tue, 30 Aug 2016 14:07:48 -0500
Eric Bavier  wrote:

> On Sat, 27 Aug 2016 10:31:44 +0200
> David Craven  wrote:
> 
> > > Is the purpose of this patch to make importers return licenses with this
> > > prefix or is there another use case?
> > 
> > Yes that's the intention. I was only thinking about the python
> > importer, but this will affect all importers.
> >   
> 
> I don't think this needs to happen.  Whether or not the symbol in the
> 'license' field of a package needs the 'license:' prefix depends on
> the module where the package definition is placed.  I'm not convinced
> that globally applying the prefix is useful.

I just wanted to point out that this will not work for any cpan modules
that are destined for (gnu packages perl) if they don't use the Perl
license.

`~Eric

Re: 05/05: gnu: prosody: Don't generate example SSL certificates.

[Leo Famulari]

On Fri, Sep 16, 2016 at 12:05:18AM +, Tobias Geerinckx-Rice wrote:
> nckx pushed a commit to branch master
> in repository guix.
> 
> commit 7f39e131805857614a171b51cbf432b4285ba1e6
> Author: Tobias Geerinckx-Rice 
> Date:   Fri Sep 16 01:44:24 2016 +0200
> 
> gnu: prosody: Don't generate example SSL certificates.
> 
> They are non-deterministic and of questionable utility.
> 
> * gnu/packages/messaging.scm (prosody)[arguments]: Add #:configure-flags.

Good catch!

Re: [PATCH] gnu: par2cmdline.

[Eric Bavier]

On Wed, 14 Sep 2016 16:43:47 +0200
l...@gnu.org (Ludovic Courtès) wrote:

> Brendan Tildesley  skribis:
> 
> > On 2016-09-13 22:09, Ludovic Courtès wrote:  
> >> Hello,
> >>
> >> Just a quick note:
> >>
> >> Brendan Tildesley  skribis:
> >>  
> >>> +   license:gpl3+  ; config.guess
> >>> +   license:x11; install-sh  
> >> These two files are build system helpers provided by Autoconf and
> >> Automake.  They are not installed so their license does not matter here.
> >>
> >> Ludo’.  
> >
> > Right, I didn't realise that.
> >
> >
> > From d63c6af98129e0de3eb1054dd69496b99a269c99 Mon Sep 17 00:00:00 2001
> > From: Brendan Tildesley 
> > Date: Tue, 13 Sep 2016 20:36:15 +1000
> > Subject: [PATCH] gnu: Add par2cmdline.
> >
> > * gnu/packages/backup.scm (par2cmdline): New variable.  
> 
> Cool.  Eric, could you apply it if your concerns have been addressed?

Pushed in f6875394a6dce98c78c3d4f222f6f9bc4d5402aa

Thanks!
`~Eric

guile-dbi: Use libltdl and prefer GUILE_DBD_PATH.

[宋文武]

Hi!

To reall, curentlly, guile-dbi use dlopen to load its backends.
So, for Guix we have to set LD_LIBRARY_PATH, which is not desired.

> [...]
> (me:)
>> I think it will be great to introduce a new search path (eg: GUILE_DBD_PATH)
>> in addition to LD_LIBRARY_PATH.  Find the absolute so filepath in it
>> ourself, then pass to dlopen.  
>
> (ludo:)
> Why not, but then it would be redundant with LD_LIBRARY_PATH and
> LTDL_LIBRARY_PATH, which would further complicate the search rules.
>

Yeah, but I just learn that libltdl has a convenient function to do
this..


So, here are patches for using libltdl and a new search path:

>From 59d529388d062ddad581bcd7f0c56690a84bf7df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 
Date: Fri, 16 Sep 2016 10:30:36 +0800
Subject: [PATCH 1/3] Use libltdl to dlopen backends.

* include/guile-dbi/guile-dbi.h (gdbi_db_handle_t): Use 'lt_dlhandle'.
* src/guile-dbi.c: Replace libdl calls with their libltdl equivalences.
* Makefile.am (SUBDIRS): Add libltdl.
* configure.ac: Use LTDL_INIT.  Add LTDLINCL and LIBLTDL to flags.
* src/Makefile.am (libguile_dbi_la_LIBDD): Remove '-ldl'.
---
 guile-dbi/Makefile.am   |  2 +-
 guile-dbi/configure.ac  |  8 +---
 guile-dbi/include/guile-dbi/guile-dbi.h |  3 ++-
 guile-dbi/src/Makefile.am   |  2 +-
 guile-dbi/src/guile-dbi.c   | 25 ++---
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/guile-dbi/Makefile.am b/guile-dbi/Makefile.am
index e4cae61..011740b 100644
--- a/guile-dbi/Makefile.am
+++ b/guile-dbi/Makefile.am
@@ -24,7 +24,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 AUTOMAKE_OPTIONS = gnu
-SUBDIRS = src include doc
+SUBDIRS = libltdl src include doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guile-dbi.pc
diff --git a/guile-dbi/configure.ac b/guile-dbi/configure.ac
index cc45703..d902cb0 100644
--- a/guile-dbi/configure.ac
+++ b/guile-dbi/configure.ac
@@ -55,14 +55,16 @@ AC_CHECK_FUNCS([strerror])
 
 # ltmain needs these:
 AC_CONFIG_MACRO_DIR([m4])
-LT_INIT
+LT_INIT([dlopen])
+LT_CONFIG_LTDL_DIR([libltdl])
+LTDL_INIT
 # AC_PROG_INSTALL
 # AC_PROG_MAKE_SET
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],1)])
 
 
-CFLAGS=`$GUILECONFIG compile`
-LIBS=`$GUILECONFIG link`
+CFLAGS="$LTDLINCL `$GUILECONFIG compile`"
+LIBS="$LIBLTDL `$GUILECONFIG link`"
 GUILE_SITE=`$GUILECONFIG info sitedir`
 
 AC_ARG_WITH([guile-site-dir],
diff --git a/guile-dbi/include/guile-dbi/guile-dbi.h b/guile-dbi/include/guile-dbi/guile-dbi.h
index b75d3dc..00449ee 100644
--- a/guile-dbi/include/guile-dbi/guile-dbi.h
+++ b/guile-dbi/include/guile-dbi/guile-dbi.h
@@ -24,6 +24,7 @@
 #define __GUILE_DBI_H__
 
 #include 
+#include 
 
 /* guile smob struct */
 typedef struct
@@ -32,7 +33,7 @@ typedef struct
   SCM constr;
   SCM status;  /* pair: car = error numeric code, cdr = status message */
   SCM closed;  /* boolean, TRUE if closed otherwise FALSE */
-  void* handle;
+  lt_dlhandle handle;
   void* db_info;
   int in_free;  /* boolean, used to avoid alloc during garbage collection */
   const char * bcknd_str;
diff --git a/guile-dbi/src/Makefile.am b/guile-dbi/src/Makefile.am
index a3001db..0795899 100644
--- a/guile-dbi/src/Makefile.am
+++ b/guile-dbi/src/Makefile.am
@@ -35,7 +35,7 @@ SUFFIXES = .x
 lib_LTLIBRARIES = libguile-dbi.la 
 
 libguile_dbi_la_SOURCES = guile-dbi.c guile-dbi.x 
-libguile_dbi_la_LIBADD = -ldl $(LIBS)
+libguile_dbi_la_LIBADD = $(LIBS)
 libguile_dbi_la_LDFLAGS = -export-dynamic -version-info @DBI_INTERFACE@
 libguile_dbi_la_DEPENDENCIES = $(LTLIBOBJS)
 
diff --git a/guile-dbi/src/guile-dbi.c b/guile-dbi/src/guile-dbi.c
index 5d797d9..d4ae040 100644
--- a/guile-dbi/src/guile-dbi.c
+++ b/guile-dbi/src/guile-dbi.c
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 
@@ -59,9 +58,8 @@ SCM_DEFINE (make_g_db_handle, "dbi-open", 2, 0, 0,
   g_db_handle->bcknd_str = scm_to_locale_string (bcknd);
   g_db_handle->bcknd_strlen = strlen(g_db_handle->bcknd_str);
 
-  /* The +20 allos for .so or .dylib on MacOS */
   sodbd_len = sizeof(char) * (strlen("libguile-dbd-") +
-   g_db_handle->bcknd_strlen + 20);
+   g_db_handle->bcknd_strlen + 1);
   sodbd = (char*) malloc (sodbd_len);
   if (sodbd == NULL)
 {
@@ -70,18 +68,14 @@ SCM_DEFINE (make_g_db_handle, "dbi-open", 2, 0, 0,
   SCM_RETURN_NEWSMOB (g_db_handle_tag, g_db_handle);
 }
 
-#ifdef  __APPLE__
-  snprintf(sodbd, sodbd_len, "libguile-dbd-%s.dylib", g_db_handle->bcknd_str);
-#else
-  snprintf(sodbd, sodbd_len, "libguile-dbd-%s.so", g_db_handle->bcknd_str);
-#endif
+  snprintf(sodbd, sodbd_len, "libguile-dbd-%s", g_db_handle->bcknd_str);
 
-  g_db_handle->handle = dlopen(sodbd, RTLD_NOW);
+  g_db_handle->handle = lt_dlopenext(sodbd);
   if (g_db_handle->handle == NULL)
 {
   free(sodbd);
   g_db_handle->status =  scm_cons(scm_from_int(1),
-

[WIP PATCH] gnu: Add evolution.

[rennes]

Hello,

this patch is evolution, a mail client for the GNOME desktop.

To run evolution is necessary to install evolution-data-server in user
profile; then I think that is required to start evolution-data-server
as a service to run successfully evolution without install evolution-
data-server in user profile.

Can some one help me, to clarify?.

any of these services requires evolution (evolution-source-registry):

* /gnu/store/0kgy9c98dlfz6ys3vv8n9s1bsry7ndgh-evolution-data-server-
3.20.1/libexec/evolution-source-registry
* /gnu/store/0kgy9c98dlfz6ys3vv8n9s1bsry7ndgh-evolution-data-server-
3.20.1/libexec/evolution-calendar-factory
* /gnu/store/qs0rsa4xacq6k9138321b2qpmfa79m09-evolution-
3.20.1/libexec/evolution/evolution-alarm-notify
* /gnu/store/0kgy9c98dlfz6ys3vv8n9s1bsry7ndgh-evolution-data-server-
3.20.1/libexec/evolution-calendar-factory-subprocess --factory contacts
--bus-name
org.gnome.evolution.dataserver.Subprocess.Backend.Calendarx13711x2 --
own-path
/org/gnome/evolution/dataserver/Subprocess/Backend/Calendar/13711/2
* /gnu/store/0kgy9c98dlfz6ys3vv8n9s1bsry7ndgh-evolution-data-server-
3.20.1/libexec/evolution-addressbook-factory
* /gnu/store/0kgy9c98dlfz6ys3vv8n9s1bsry7ndgh-evolution-data-server-
3.20.1/libexec/evolution-calendar-factory-subprocess --factory local --
bus-name
org.gnome.evolution.dataserver.Subprocess.Backend.Calendarx13711x3 --
own-path
/org/gnome/evolution/dataserver/Subprocess/Backend/Calendar/13711/3
* /gnu/store/0kgy9c98dlfz6ys3vv8n9s1bsry7ndgh-evolution-data-server-
3.20.1/libexec/evolution-addressbook-factory-subprocess --factory local
--bus-name
org.gnome.evolution.dataserver.Subprocess.Backend.AddressBookx13743x2
--own-path
/org/gnome/evolution/dataserver/Subprocess/Backend/AddressBook/13743/2


Thank youFrom c3d83fcc79da21c8181a10e44568bbe0227fc99e Mon Sep 17 00:00:00 2001
From: Rene Saavedra 
Date: Thu, 15 Sep 2016 19:40:39 -0500
Subject: [PATCH] gnu: Add evolution.

* gnu/packages/evolution.scm (evolution): New file.

---
 gnu/packages/evolution.scm | 93 ++
 1 file changed, 93 insertions(+)
 create mode 100644 gnu/packages/evolution.scm

diff --git a/gnu/packages/evolution.scm b/gnu/packages/evolution.scm
new file mode 100644
index 000..305893f
--- /dev/null
+++ b/gnu/packages/evolution.scm
@@ -0,0 +1,93 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Rene Saavedra 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu packages evolution)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages enchant)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages libcanberra)
+  #:use-module (gnu packages mail)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages webkit))
+
+(define-public evolution
+  (package
+(name "evolution")
+(version "3.20.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "mirror://gnome/sources/" name "/"
+   (version-major+minor version) "/"
+   name "-" version ".tar.xz"))
+   (sha256
+(base32
+ "1lr700xvwflsp6jkd7fg8yv68qzrvyhg7ryjzk2n68m61zi6g582"
+(build-system glib-or-gtk-build-system)
+(arguments
+ ;; Optional modules, not packaged yet.
+ `(#:configure-flags (list
+  ;; gnome-autoar not packaged yet.
+  "--enable-autoar=no"
+  ;; libcryptui not packaged yet.
+  "--disable-libcryptui"
+  ;; text-highlight not packaged yet.
+  "--disable-text-highlight"
+  ;; pst-import not packaged yet.
+  "--disable-pst-import"
+  ;; spamassassin not packaged yet.
+  "--with-spamassassin=no")))
+(native-inputs
+ `(("intltool" ,intltool)
+   ("itstool" ,itstool)
+   ("pkg-config" 

Re: [PATCH] gnu: Add gloox.

[ng0]

ng0  writes:

> [ Unknown signature status ]
>
> This patch adds gloox, a dependency for 0ad needs for their "lobby"
> feature. Gentoo builds it with libressl without any patches applied,
> they had a long discussion and are very strict in their testing, looking
> at the tests comparing libressl and openssl builds I did there was no
> failure and if it won't work I'll notice with 0ad. I'm positive that it
> works.

Sorry, I need to add context.. The now internal libressl project took
quiet some time to be accepted by gentoo project, at least 6 months or
more. software is tested against openssl and libressl and failures are
fixed before (i'm cutting down explanations here) the specific way to
treat openssl+libressl is added. I think it is okay for us to have
libressl there.
As I said on irc, I'll come up with an email for a plan with some
possible paths regarding libressl in general.


> From 1dc99c1336e5e372e06914a06eec67faac1b70d1 Mon Sep 17 00:00:00 2001
> From: ng0 
> Date: Thu, 15 Sep 2016 21:46:46 +
> Subject: [PATCH] gnu: Add gloox.
>
> * gnu/packages/messaging.scm (gloox): New variable.
> ---
>  gnu/packages/messaging.scm | 29 +
>  1 file changed, 29 insertions(+)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 3627fec..a4ec95f 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -755,4 +755,33 @@ for sending encrypted messages to one person or many 
> subscribers.")
>  (synopsis "Distributed peer-to-peer communication")
>  (home-page "https://bitmessage.org/;)))
>  
> +(define-public gloox
> +  (package
> +(name "gloox")
> +(version "1.0.17")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (string-append "https://camaya.net/download/gloox-;
> +   version ".tar.bz2"))
> +   (sha256
> +(base32
> + "09c01jr5nrm7f1ly42wg0pqqscmp48pv8y2fjx1vwbavjxdq59ri"
> +(build-system gnu-build-system)
> +(inputs
> + `(("libidn" ,libidn)
> +   ("gnutls" ,gnutls)
> +   ("libressl" ,libressl)
> +   ("zlib" ,zlib)))
> +(native-inputs
> + `(("pkg-config" ,pkg-config)))
> +(synopsis "Portable high-level Jabber/XMPP library for C++")
> +(description
> + "gloox is a full-featured Jabber/XMPP client library,
> +written in ANSI C++.  It makes writing spec-compliant clients easy
> +and allows for hassle-free integration of Jabber/XMPP functionality
> +into existing applications.")
> +(home-page "http://camaya.net/gloox;)
> +(license license:gpl3)))
> +
>  ;;; messaging.scm ends here
> -- 
> 2.10.0
>
>
> -- 
>   ng0

-- 
  ng0

[PATCH] gnu: Add gloox.

[ng0]

This patch adds gloox, a dependency for 0ad needs for their "lobby"
feature. Gentoo builds it with libressl without any patches applied,
they had a long discussion and are very strict in their testing, looking
at the tests comparing libressl and openssl builds I did there was no
failure and if it won't work I'll notice with 0ad. I'm positive that it
works.

From 1dc99c1336e5e372e06914a06eec67faac1b70d1 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Thu, 15 Sep 2016 21:46:46 +
Subject: [PATCH] gnu: Add gloox.

* gnu/packages/messaging.scm (gloox): New variable.
---
 gnu/packages/messaging.scm | 29 +
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3627fec..a4ec95f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -755,4 +755,33 @@ for sending encrypted messages to one person or many subscribers.")
 (synopsis "Distributed peer-to-peer communication")
 (home-page "https://bitmessage.org/;)))
 
+(define-public gloox
+  (package
+(name "gloox")
+(version "1.0.17")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "https://camaya.net/download/gloox-;
+   version ".tar.bz2"))
+   (sha256
+(base32
+ "09c01jr5nrm7f1ly42wg0pqqscmp48pv8y2fjx1vwbavjxdq59ri"
+(build-system gnu-build-system)
+(inputs
+ `(("libidn" ,libidn)
+   ("gnutls" ,gnutls)
+   ("libressl" ,libressl)
+   ("zlib" ,zlib)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(synopsis "Portable high-level Jabber/XMPP library for C++")
+(description
+ "gloox is a full-featured Jabber/XMPP client library,
+written in ANSI C++.  It makes writing spec-compliant clients easy
+and allows for hassle-free integration of Jabber/XMPP functionality
+into existing applications.")
+(home-page "http://camaya.net/gloox;)
+(license license:gpl3)))
+
 ;;; messaging.scm ends here
-- 
2.10.0


-- 
  ng0


signature.asc
Description: PGP signature

Re: [Patch 10/10] Add ring-client-gnome.

[Danny Milosavljevic]

> +  (propagated-inputs
> +   `(("libring" ,libring) ; This is needed to run dring.

Wait... I don't understand why it's required to be propagated...

> + ("adwaita-icon-theme" ,adwaita-icon-theme)

Okay.

> + ("evolution-data-server" ,evolution-data-server)))

Hmm. Why is it propagated? Most other packages seem to be able to use it as a 
regular input just fine. Are they wrong?

Re: [Patch 6/10] telephony: Add license prefix.

[Danny Milosavljevic]

LGTM

Re: [Patch 4/10] argon2: Install pkg-config file.

[Danny Milosavljevic]

> +   (snippet
> +'(let ((p (open-file "argon2.pc" "a")))
...  ^ why?

> +   (begin
> + (display
> +  (string-append "prefix=/usr/local\n"
> + "exec_prefix=${prefix}\n"
> + "includedir=${prefix}/include\n"
> + "libdir=${prefix}/lib\n\n"
> + "Name: Argon2\n"
> + "Description: "
> + "The Argon2 password hashing algorithm\n"
> + "Version: 1.0.0\n"
> + "Cflags: -I${includedir}/\n"
> + "Libs: -L${libdir} -largon2\n") p)
> + (close-output-port p

Ok but please try to upstream this as well.

> +   (zero? (system* "ln" "-s"
> +   (string-append out "/lib/libargon2.so")
> +   (string-append out "/lib/libargon2.so.0")))

The result of this will be ignored. Did you mean "(and ...)"?

> +   (zero? (system* ; Fix compatability for libtool based builds.
> +   "ln" "-s"
> +   (string-append out "/lib/libargon2.so")
> +   (string-append out "/lib/libargon2.so.0.0.0")

Doesn't this have a soversion other than 0? I mean it's OK, I'm just asking to 
be sure - because the pkg-config file lists 1.0.0 and the name of the 
pkg-config file contains no soversion at all.

Re: [PATCH] gnu: Add linux-pam.

[rennes]

Hello Ludovic,

> What’s the status of this patch?
> 
> If discussion with upstream is underway, we could apply it in
> core-udpates.

I have not been answered by the team of linux-pam. This is my ticket:

https://fedorahosted.org/linux-pam/ticket/64


Thanks

Re: [PATCH] gnu: Add linux-pam.

[Ludovic Courtès]

Hello!

ren...@openmailbox.org skribis:

> This is a patch for linux-pam, at compile on the Hurd system searches
> the file fsuid.h. The patch was taken from the Debian project.
>
>  * This patch is prerequisite for lsh/openssh packages.
>  * The patch was build and installed on Linux and the Hurd systems.
>
> Thanks
>
> From c7ddf09a79ad33d69b5ac8080b6131763e836ae5 Mon Sep 17 00:00:00 2001
> From: Rene Saavedra 
> Date: Fri, 26 Aug 2016 23:19:14 -0500
> Subject: [PATCH] gnu: Add linux-pam.
>
>   * gnu/packages/linux.scm (linux-pam): Use it.
>   * gnu/packages/patches/linux-pam-no-setfsuid.patch: New file.
>   * gnu/local.mk (dist_patch_DATA): Add it.

What’s the status of this patch?

If discussion with upstream is underway, we could apply it in
core-udpates.

Thanks,
Ludo’.

Re: "filesystem" vs. "file system"

[Ludovic Courtès]

John Darrington  skribis:

> On Tue, Sep 13, 2016 at 01:45:19PM +0200, Ludovic Court??s wrote:
>  John Darrington  skribis:
>  
>  
>  > +The @code{(gnu services nfs)} module provides the following services,
>  > +which are most commonly used in relation to mouting or exporting NFS
>  > +filesystems.
>  
>  (Always write ???file system??? as two words.)
>
>
> I agree that we should be consistent about this.  There are numerous examples
> where we have used "filesystem" whilst others use "file system".
>
> Shall I checkin a fix?

Sure.  We have to be careful not to modify it in places where it
shouldn’t, such as URLs, file names, or identifiers.

Cheers,
Ludo’.

Re: [PATCH 1/2] gnu: add python-django.

[Hartmut Goebel]

Hello Ludo,
> Do you want to send a patch to fix this?
enclosed please find the patch. Please double check to ensure I did not
re-mix-it-up :-) In case of any doubt, please ask.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel  | h.goe...@crazy-compilers.com   |
| www.crazy-compilers.com | compilers which you thought are impossible |

From d945e207eeb6b6bf61019a18bdaf3397883f5cb3 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 15 Sep 2016 22:07:29 +0200
Subject: [PATCH] gnu: python-django, python2-django: Fix propagated- and
 native-inputs.

setuptools is a run-time dependency (sic!), all others are required
for testing only.

* gnu/packages/django.scm (python-django) [propagated-inputs,
  native-inputs]: Exchange them. Move tzdata to new native-inputs.
  Enhance comments.
  (python2-django) [propagated-inputs] change into native-inputs.
  Enhance comment.
---
 gnu/packages/django.scm | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b9232e2..b2589cc 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -54,16 +54,17 @@
  (string-append ".:" (getenv "PYTHONPATH")))
  (zero? (system* "python" "tests/runtests.py")))
 ;; TODO: Install extras/django_bash_completion.
-(native-inputs
+(propagated-inputs
  ;; Django uses 'pkg_resources' (part of setuptools) to locate templates
  ;; at run-time.
- `(("python-setuptools" ,python-setuptools)
-   ("tzdata", tzdata)))
-(propagated-inputs
- `( ;; bcrypt and argon2-cffi are extra requirements not yet in guix
+ `(("python-setuptools" ,python-setuptools)))
+(native-inputs
+ `(("tzdata", tzdata)
+   ;; bcrypt and argon2-cffi are extra requirements not yet in guix
;;("python-argon2-cffi" ,python-argon2-cffi) ; >= 16.1.0
;;("python-bcrypt" ,python-bcrypt) ; not py-bcrypt!
-   ;; Taken from tests/requirements/py3.txt.
+   ;; Remaining packages are test requirements taken from
+   ;; tests/requirements/py3.txt
("python-docutils" ,python-docutils)
;; optional for tests: ("python-geoip2" ,python-geoip2)
("python-jinja2" ,python-jinja2)   ; >= 2.7
@@ -89,8 +90,9 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
   (let ((base (package-with-python2 (strip-python2-variant python-django
 (package
   (inherit base)
-  (propagated-inputs
-   `(;; Required for Python 2: enum34 and mock.
+  (native-inputs
+   `(;; Test requirements for Python 2 taken from
+ ;; tests/requirements/py3.txt: enum34 and mock.
  ("python2-enum34" ,python2-enum34)
  ("python2-mock" ,python2-mock)
  ;; When adding memcached mind: for Python 2 memcached <= 1.53 is
-- 
2.7.4

New German PO file for 'guix' (version 0.11.0)

[Translation Project Robot]

Hello, gentle maintainer.

This is a message from the Translation Project robot.

A revised PO file for textual domain 'guix' has been submitted
by the German team of translators.  The file is available at:

http://translationproject.org/latest/guix/de.po

(We can arrange things so that in the future such files are automatically
e-mailed to you when they arrive.  Ask at the address below if you want this.)

All other PO files for your package are available in:

http://translationproject.org/latest/guix/

Please consider including all of these in your next release, whether
official or a pretest.

Whenever you have a new distribution with a new version number ready,
containing a newer POT file, please send the URL of that distribution
tarball to the address below.  The tarball may be just a pretest or a
snapshot, it does not even have to compile.  It is just used by the
translators when they need some extra translation context.

The following HTML page has been updated:

http://translationproject.org/domain/guix.html

If any question arises, please contact the translation coordinator.

Thank you for all your work,

The Translation Project robot, in the
name of your translation coordinator.

Re: [PATCH] Add gctp

[Thomas Danckaert]

Hi Guix,

I've cleaned up my gctp patch, following your advice:

From: Leo Famulari 
Subject: Re: [PATCH] Add gctp
Date: Mon, 18 Jul 2016 17:47:23 -0400


If it's not possible to use the bundled GCTPs then we have to use an
external library, but I think it should be maintained outside of 
Guix.
As you say, it should not be much work to put it on a public Git 
repo or

to host a tarball, since the development is basically complete.


I took the contents of the gctpc20.tar.Z archive distributed with 
wgrib2, added an autoconf-based build script, and published the 
repository on Github.  Changes are minor: I had to make some changes 
to the test programs, and fix one input routine (int size mismatch 
when reading an auxiliary binary file).


This version of the patch uses a release tarball published on github. 
Is there a better place I can host a tarball (if not the repository 
itself?).


best,

Thomas
>From 442f902377c95d72b59d2311c78df2d403f02ea4 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert 
Date: Fri, 17 Jun 2016 10:41:50 +0200
Subject: [PATCH] gnu: Add gctp.

* gnu/packages/maths.cm (gctp): New variable.
---
 gnu/packages/maths.scm | 24 
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 44a24ef..e275436 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -418,6 +418,30 @@ plotting engine by third-party applications like Octave.")
   (license (license:fsf-free
 "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright;)
 
+(define-public gctp
+  (package
+(name "gctp")
+(version "2.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri "https://github.com/OkoSanto/GCTP/archive/v2.0.0.tar.gz;)
+   (sha256
+(base32
+ "0l9aqnqynh9laicn5dxf3rsb1n14xiks79wbyqccirzmjqd1c1x4"
+(native-inputs
+ `(("fortran" ,gfortran)))
+(build-system gnu-build-system)
+(synopsis "General Cartographic Transformation Package (GCTP)")
+(description
+ "The General Cartographic Transformation Package (GCTP) is a system of
+software routines designed to permit the transformation of coordinate pairs
+from one map projection to another.  The GCTP is the standard computer
+software used by the National Mapping Division for map projection
+computations.")
+(home-page "https://github.com/OkoSanto/GCTP;)
+(license 'license:public-domain))) ; https://www2.usgs.gov/laws/info_policies.html
+
 (define-public hdf5
   (package
 (name "hdf5")
-- 
2.10.0

cracklib: Fix buffer overflow

[Leo Famulari]

This patch cherry-picks an upstream commit to fix a buffer overflow in
cracklib. Please see the patch file for more information about the bug.
From 62f8f1763ba1766e92e8dc05686bd9353eaf2ad5 Mon Sep 17 00:00:00 2001
From: Leo Famulari 
Date: Thu, 15 Sep 2016 11:34:49 -0400
Subject: [PATCH] gnu: cracklib: Fix buffer overflow.

* gnu/packages/patches/cracklib-fix-buffer-overflow.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/password-utils.scm (cracklib)[source]: Use it.
---
 gnu/local.mk   |  1 +
 gnu/packages/password-utils.scm|  3 +-
 .../patches/cracklib-fix-buffer-overflow.patch | 39 ++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/cracklib-fix-buffer-overflow.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index a7006cb..ab052af 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -473,6 +473,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/cpio-CVE-2016-2037.patch\
   %D%/packages/patches/cpufrequtils-fix-aclocal.patch  \
   %D%/packages/patches/cracklib-CVE-2016-6318.patch\
+  %D%/packages/patches/cracklib-fix-buffer-overflow.patch  \
   %D%/packages/patches/crda-optional-gcrypt.patch  \
   %D%/packages/patches/crossmap-allow-system-pysam.patch   \
   %D%/packages/patches/csound-header-ordering.patch\
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 7288da6..40ed933 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -160,7 +160,8 @@ and vice versa.")
   (uri (string-append "https://github.com/cracklib/cracklib/;
   "releases/download/" name "-" version "/"
   name "-" version ".tar.gz"))
-  (patches (search-patches "cracklib-CVE-2016-6318.patch"))
+  (patches (search-patches "cracklib-CVE-2016-6318.patch"
+   "cracklib-fix-buffer-overflow.patch"))
   (sha256
(base32
 "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp"
diff --git a/gnu/packages/patches/cracklib-fix-buffer-overflow.patch 
b/gnu/packages/patches/cracklib-fix-buffer-overflow.patch
new file mode 100644
index 000..b1c990f
--- /dev/null
+++ b/gnu/packages/patches/cracklib-fix-buffer-overflow.patch
@@ -0,0 +1,39 @@
+Fix buffer overflow processing long words in Mangle().
+
+Patch adpated from upstream commit, omitting changes to 'NEWS':
+
+https://github.com/cracklib/cracklib/commit/33d7fa4585247cd2247a1ffa032ad245836c6edb
+
+From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001
+From: Jan Dittberner 
+Date: Thu, 25 Aug 2016 17:17:53 +0200
+Subject: [PATCH] Fix a buffer overflow processing long words
+
+A buffer overflow processing long words has been discovered. This commit
+applies the patch from
+https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch
+by Howard Guo.
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and
+http://www.openwall.com/lists/oss-security/2016/08/23/8
+---
+ src/NEWS| 1 +
+ src/lib/rules.c | 5 ++---
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/rules.c b/src/lib/rules.c
+index d193cc0..3a2aa46 100644
+--- a/lib/rules.c
 b/lib/rules.c
+@@ -434,9 +434,8 @@ Mangle(input, control) /* returns a pointer to 
a controlled Mangle */
+ {
+ int limit;
+ register char *ptr;
+-static char area[STRINGSIZE];
+-char area2[STRINGSIZE];
+-area[0] = '\0';
++static char area[STRINGSIZE * 2] = {0};
++char area2[STRINGSIZE * 2] = {0};
+ strcpy(area, input);
+ 
+ for (ptr = control; *ptr; ptr++)
-- 
2.10.0



signature.asc
Description: PGP signature

Re: [PATCH] gnu: Add darkhttpd.

[Leo Famulari]

On Thu, Sep 15, 2016 at 11:47:16AM +0530, Arun Isaac wrote:
> 
> > I found some tests! See attached. Part of the test suite wants some
> > static library from Clang / LLVM; I couldn't make that work in 5 minutes
> > so I gave up ;) I think it's okay to commit in this state.
> 
> Yeah, the darkhttpd git repo has some test cases, but the release
> tarball does not. Since we will be moving to the release tarball once
> the release tarball URL problem is fixed upstream, I think we should not
> do the test cases.

Okay, makes sense. Pushed as 797a5cf57f038e31e464afd5256a9faff5b46689


signature.asc
Description: PGP signature

[PATCH] gnu: Add enet.

[ng0]

This adds one dependency for the graph of the game 0ad: enet.

From 950cbd3b274c583e8c639633527b8174d78836be Mon Sep 17 00:00:00 2001
From: ng0 
Date: Thu, 15 Sep 2016 15:01:14 +
Subject: [PATCH] gnu: Add enet.

* gnu/packages/networking.scm (enet): New variable.
---
 gnu/packages/networking.scm | 28 
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index c4edbc3..46bda99 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -824,3 +824,31 @@ in dynamically linked programs and redirects them through one or more SOCKS or
 HTTP proxies.")
 (home-page "https://github.com/rofl0r/proxychains-ng;)
 (license license:gpl2+)))
+
+(define-public enet
+  (package
+(name "enet")
+(version "1.3.13")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "http://enet.bespin.org/download/;
+  name "-" version ".tar.gz"))
+  (sha256
+   (base32
+"0p53mnmjbm56wizwraznynx13fcibcxiqny110dp6a5a3w174q73"
+(build-system gnu-build-system)
+(inputs
+ `(("pkg-config" ,pkg-config)))
+(synopsis
+ "Relatively thin, simple and robust network communication layer
+on top of UDP")
+(description
+ "ENet's purpose is to provide a relatively thin, simple and robust
+network communication layer on top of UDP.
+The primary feature it provides is optional reliable, in-order delivery
+of packets.  ENet omits certain higher level networking features such as
+authentication, lobbying, server discovery, encryption, or other similar
+tasks that are particularly application specific so that the library
+remains flexible, portable, and easily embeddable.")
+(home-page "http://enet.bespin.org;)
+(license license:expat)))
-- 
2.10.0


-- 
  ng0


signature.asc
Description: PGP signature

Re: [PATCH] gnu: Add qscintilla.

[Kei Kebreau]

Kei Kebreau  writes:

> Efraim Flashner  writes:
>
>> On September 14, 2016 11:37:46 PM GMT+03:00, Kei Kebreau
>>  wrote:
>>>Leo Famulari  writes:
>>>
 On Wed, Sep 14, 2016 at 02:11:44PM -0400, Kei Kebreau wrote:
> Leo Famulari  writes:
> 
> > On Tue, Sep 13, 2016 at 08:48:43PM +, Efraim Flashner wrote:
> >> On September 13, 2016 11:37:35 PM GMT+03:00, Kei Kebreau
> >>  wrote:
> >> >In this case, should I leave qtscintilla-qt4 as a public package
>>>in
> >> >qt.scm
> >> >instead of maths.scm as Leo suggested?
> >> 
> >> That's where I would leave it. You could also leave a note,
>>>saying
> >> that it was for octave, and if they switch to qt5 then we can get
>>>rid
> >> of it. We still have an old vte package I added for a terminal
>>>since
> >> all the bug reports around it haven't been cleared yet, and
>>>that's
> >> with the other versions of vte.  -- 
> >
> > Sounds like a plan!
> 
> Alright then! I have all three patches here. Tell me if I did
>>>anything
> funny. The order of application is "Add qscintilla, Add
>>>qscintilla-qt4,
> Enable Octave's Qt 4 GUI." :)

 The patches "Add qscintilla" and "Add qscintilla-qt4" both add both
 packages.
>>>
>>>Fixed it.
>>
>> If you switch ("qtbase" ,qtbase) to ("qt" ,qtbase) can you remove the
>> whole argument block from qscintilla?
>
> I can! Nice catch.

Forgot to use the qt module in the GNU Octave patch...

From f00730e07e56b3095f921ea1ab3f8b2b1d46a9ab Mon Sep 17 00:00:00 2001
From: Kei Kebreau 
Date: Thu, 15 Sep 2016 10:23:59 -0400
Subject: [PATCH] gnu: octave: Enable Octave's Qt 4 GUI.

* gnu/packages/maths.scm (octave)[inputs]: Add qscintilla-qt4 and qt-4.
---
 gnu/packages/maths.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 44a24ef..ccb43b1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -77,6 +77,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages tbb)
   #:use-module (gnu packages shells)
@@ -717,6 +718,8 @@ can solve two kinds of problems:
("libxft" ,libxft)
("mesa" ,mesa)
("glu" ,glu)
+   ("qscintilla" ,qscintilla-qt4)
+   ("qt" ,qt-4)
("zlib" ,zlib)))
 (native-inputs
  `(("gfortran" ,gfortran)
-- 
2.10.0



signature.asc
Description: PGP signature

Re: [PATCH] refresh nss-certs

[Leo Famulari]

On Wed, Sep 07, 2016 at 01:13:19PM +0200, Vincent Legoll wrote:
> On Fri, Sep 2, 2016 at 2:21 PM, Ludovic Courtès  wrote:
> > If NSS and its main users (IceCat) build fine, I would suggest applying
> > this patch.
> 
> Build tested on GuixSD, .config/guix/latest pointing to current git,
> with above patch
> (cleanly) rebased on top...
> 
> $ guix --version
> guix (GNU Guix) 0.11.0
> Copyright (C) 2016 the Guix authors
> License GPLv3+: GNU GPL version 3 or later 
> This is free software: you are free to change and redistribute it.
> There is NO WARRANTY, to the extent permitted by law.
> 
> $ guix package -l
> 
> [...]
> 
> Generation 34Sep 07 2016 11:57:40(current)
>   nss3.26out/gnu/store/fqzw00zvd5fvqikzk9f1yzsi2vn4n6kb-nss-3.26
>   nss-certs3.26out
> /gnu/store/4ij62g7004092sv9qm81xaxx8g3cpgnl-nss-certs-3.26
>   urlmatch1.0out
> /gnu/store/gsp3fqgmdhlay7k3cfbi5cgp3w7abvd8-urlmatch-1.0
>   fltk1.3.3out
> /gnu/store/hvmsicw1ac45bfxmsf7sjp93pjiq9177-fltk-1.3.3
>   icecat38.8.0-gnu2out
> /gnu/store/afga2dhg6zikg71c5rxrqkm0dvkd0j5m-icecat-38.8.0-gnu2
> 
> But I haven't tested the resulting icecat (this is a headless VM, and
> I haven't found the required
> incantations to make ssh -X work...
> 
> Please apply or comment

Pushed, thanks Vincent!

Re: [PATCH 0/2] Updated patches for gunicorn

[Hartmut Goebel]

Am 15.09.2016 um 13:27 schrieb ng0:
> Thanks. One question, can't they be squashed so that it's just one
> initial commit?

It can. I split it up to make it easier compare the changes to my first
attempt.

Whoever will commit the patch: feel free to merge it.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel  | h.goe...@crazy-compilers.com   |
| www.crazy-compilers.com | compilers which you thought are impossible |

[PATCH 3/7] gnu: Add r-biocviews.

[Roel Janssen]

* gnu/packages/bioinformatics.scm (r-biocviews): New variable.
---
 gnu/packages/bioinformatics.scm | 28 
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3d607cc..fa32075 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5333,6 +5333,34 @@ CRAN, and (some) github packages.")
 the graph algorithms contained in the Boost library.")
 (license license:artistic2.0)))
 
+(define-public r-biocviews
+  (package
+(name "r-biocviews")
+(version "1.40.1")
+(source (origin
+  (method url-fetch)
+  (uri (bioconductor-uri "biocViews" version))
+  (sha256
+   (base32
+"1d1g06zwx3xhc07mdhs5x31730xw08fg3x73xyfj0qdy2ykww3f9"
+(properties
+ `((upstream-name . "biocViews")))
+(build-system r-build-system)
+(propagated-inputs
+ `(("r-biobase" ,r-biobase)
+   ("r-graph" ,r-graph)
+   ("r-rbgl" ,r-rbgl)
+   ("r-rcurl" ,r-rcurl)
+   ("r-xml" ,r-xml)
+   ("r-knitr" ,r-knitr)
+   ("r-runit" ,r-runit)))
+(home-page "http://bioconductor.org/packages/Biocviews;)
+(synopsis "Bioconductor structures for vocabularies and narratives of 
+views")
+(description "This package provides structures for vocabularies and
+narratives of views for Bioconductor packages.")
+(license license:artistic2.0)))
+
 (define-public r-dnacopy
   (package
 (name "r-dnacopy")
-- 
2.10.0

[PATCH 7/7] gnu: Add r-bioccheck.

[Roel Janssen]

* gnu/packages/bioinformatics.scm (r-bioccheck): New variable.
---
 gnu/packages/bioinformatics.scm | 29 +
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 902d1d2..00a4161 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5426,6 +5426,35 @@ like automatically generated help option and usage, 
support for default
 values, positional argument support, etc.")
 
 (license license:gpl2+)))
 
+(define-public r-bioccheck
+  (package
+(name "r-bioccheck")
+(version "1.8.2")
+(source (origin
+  (method url-fetch)
+  (uri (bioconductor-uri "BiocCheck" version))
+  (sha256
+   (base32
+"0bvkhxmr25nb0gkncifbc3x48i5zgls3737g3xais6jx16wd4q35"
+(properties
+ `((upstream-name . "BiocCheck")))
+(build-system r-build-system)
+(inputs
+ `(("which" ,which)))
+(propagated-inputs
+ `(("r-graph" ,r-graph)
+   ("r-knitr" ,r-knitr)
+   ("r-httr" ,r-httr)
+   ("r-optparse" ,r-optparse)
+   ("r-devtools" ,r-devtools)
+   ("r-biocinstaller" ,r-biocinstaller)
+   ("r-biocviews" ,r-biocviews)))
+(home-page "http://bioconductor.org/packages/BiocCheck;)
+(synopsis "Executes Bioconductor-specific package checks")
+(description "This package executes Bioconductor-specific
+package checks.")
+(license license:artistic2.0)))
+
 (define-public r-dnacopy
   (package
 (name "r-dnacopy")
-- 
2.10.0

[PATCH 6/7] gnu: Add r-getopt. * gnu/packages/bioinformatics.scm (r-getopt): New variable. --- gnu/packages/bioinformatics.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)

[Roel Janssen]

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index af32d66..902d1d2 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5404,6 +5404,28 @@ functionality.")
 scripts that accept short and long flag/options.")
 (license license:gpl2+)))
 
+(define-public r-getopt
+  (package
+(name "r-getopt")
+(version "1.20.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "getopt" version))
+   (sha256
+(base32
+ "00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"
+(build-system r-build-system)
+(home-page "https://github.com/trevorld/getopt;)
+(synopsis "C-like getopt behavior")
+(description
+ "Package designed to be used with Rscript to write ``#!'' shebang
+scripts that accept short and long flags/options.  Many users will prefer
+using instead the packages optparse or argparse which add extra features
+like automatically generated help option and usage, support for default
+values, positional argument support, etc.")
 
+(license license:gpl2+)))
+
 (define-public r-dnacopy
   (package
 (name "r-dnacopy")
-- 
2.10.0

[PATCH 2/7] gnu: Add r-rbgl.

[Roel Janssen]

* gnu/packages/bioinformatics.scm (r-rbgl): New variable.
---
 gnu/packages/bioinformatics.scm | 24 
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index ffb9692..3d607cc 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5309,6 +5309,30 @@ packages.")
 CRAN, and (some) github packages.")
 (license license:artistic2.0)))
 
+(define-public r-rbgl
+  (package
+(name "r-rbgl")
+(version "1.49.3")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"https://bioconductor.org/packages/3.4/bioc/src/contrib/;
+"RBGL_" version ".tar.gz"))
+  (sha256
+   (base32
+"0rpiqpalbxk82jkwv3l0fimq9y2hrdi0f7ca4v21318541vfsncs"
+(properties
+ `((upstream-name . "RBGL")))
+(build-system r-build-system)
+(propagated-inputs
+ `(("r-graph" ,r-graph)))
+(home-page "http://bioconductor.org/packages/RBGL;)
+(synopsis "Interface to the graph algorithms from Boost")
+(description
+ "This package provides a fairly extensive and comprehensive interface to
+the graph algorithms contained in the Boost library.")
+(license license:artistic2.0)))
+
 (define-public r-dnacopy
   (package
 (name "r-dnacopy")
-- 
2.10.0

[PATCH 4/7] gnu: Add r-biocstyle.

[Roel Janssen]

* gnu/packages/bioinformatics.scm (r-biocstyle): New variable.
---
 gnu/packages/bioinformatics.scm | 20 
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index fa32075..225e470 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5361,6 +5361,26 @@ views")
 narratives of views for Bioconductor packages.")
 (license license:artistic2.0)))
 
+(define-public r-biocstyle
+  (package
+   (name "r-biocstyle")
+   (version "2.0.3")
+(source (origin
+  (method url-fetch)
+  (uri (bioconductor-uri "BiocStyle" version))
+  (sha256
+   (base32
+"06aaj0snj0y3bhhfh7lr949fi6cg7gz6fwf5drdm10ckbs4zp9dk"
+(properties
+ `((upstream-name . "BiocStyle")))
+(build-system r-build-system)
+(home-page "http://bioconductor.org/packages/BiocStyle;)
+(synopsis "Bioconductor formatting styles")
+(description "This package provides standard formatting styles for
+Bioconductor PDF and HTML documents.  Package vignettes illustrate use and
+functionality.")
+(license license:artistic2.0)))
+
 (define-public r-dnacopy
   (package
 (name "r-dnacopy")
-- 
2.10.0

[PATCH 5/7] gnu: Add r-optparse.

[Roel Janssen]

* gnu/packages/bioinformatics.scm (r-optparse): New variable.
---
 gnu/packages/bioinformatics.scm | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 225e470..af32d66 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5381,6 +5381,29 @@ Bioconductor PDF and HTML documents.  Package vignettes 
illustrate use and
 functionality.")
 (license license:artistic2.0)))
 
+(define-public r-optparse
+  (package
+(name "r-optparse")
+(version "1.3.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "optparse" version))
+   (sha256
+(base32
+ "1g8as89r91xxi5j5azsd6vrfrhg84mnfx2683j7pacdp8s33radw"
+(build-system r-build-system)
+(propagated-inputs
+ `(("r-getopt" ,r-getopt)))
+(home-page
+ "https://github.com/trevorld/optparse;)
+(synopsis "Command Line Option Parser")
+(description
+ "This package provides a command line parser inspired by Python's
+'optparse' library to be used with Rscript to write \"#!\" shebang
+scripts that accept short and long flag/options.")
+(license license:gpl2+)))
+
 (define-public r-dnacopy
   (package
 (name "r-dnacopy")
-- 
2.10.0

[PATCH 1/7] gnu: Add r-biocinstaller.

[Roel Janssen]

* gnu/packages/bioinformatics.scm (r-biocinstaller): New variable.
---
 gnu/packages/bioinformatics.scm | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 39a420a..ffb9692 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5290,6 +5290,25 @@ barplots or heatmaps.")
 packages.")
 (license license:artistic2.0)))
 
+(define-public r-biocinstaller
+  (package
+(name "r-biocinstaller")
+(version "1.22.3")
+(source (origin
+  (method url-fetch)
+  (uri (bioconductor-uri "BiocInstaller" version))
+  (sha256
+   (base32
+"02qkfq6f2b7v9klri6d1nv21r54bywv1zd5x47ka0jhhp946cqpr"
+(properties
+ `((upstream-name . "BiocInstaller")))
+(build-system r-build-system)
+(home-page "http://bioconductor.org/packages/BiocInstaller;)
+(synopsis "Bioconductor installer package")
+(description "This package is used to install and update Bioconductor,
+CRAN, and (some) github packages.")
+(license license:artistic2.0)))
+
 (define-public r-dnacopy
   (package
 (name "r-dnacopy")
-- 
2.10.0

[PATCH 0/7] Add bioconductor package creation tools.

[Roel Janssen]

Dear Guix,

In the following patch series I add packages to do package development
for Bioconductor.  They have a couple of tools to perform extra checks
to ensure Bioconductor packages work together well.

Since I am trying to add a package to Bioconductor, I need these
packages in GNU Guix.  I've been using them for a couple of days and
it seems to work fine.

Kind regards,
Roel Janssen

Re: [PATCH 0/2] Updated patches for gunicorn

[ng0]

Hi,

Hartmut Goebel  writes:

> As discussed, I updated some comments. Additionally I added building teh
> documentation (2nd patch).

Thanks. One question, can't they be squashed so that it's just one
initial commit?

> Hartmut Goebel (2):
>   gnu: Add gunicorn and gunicorn-python2.
>   gnu: Build documentation for gunicorn and gunicorn-python2.
>
>  gnu/packages/web.scm | 80 
> 
>  1 file changed, 80 insertions(+)
>
> -- 
> 2.7.4
>
>
>

-- 
  ng0

[PATCH 1/2] gnu: Add gunicorn and gunicorn-python2.

[Hartmut Goebel]

* gnu/packages/web.scm (gunicorn, gunicorn-python2): New variables.
---
 gnu/packages/web.scm | 55 
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b9c201d..3841c6b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2016 Ben Woodcroft 
 ;;; Copyright © 2016 Clément Lassieur 
 ;;; Copyright © 2016 ng0 
+;;; Copyright © 2016 Hartmut Goebel 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,6 +42,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system perl)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system r)
   #:use-module (guix build-system trivial)
@@ -3633,3 +3635,56 @@ provides a unix command line interface to a variety of 
popular www search engine
 and similar services.")
 (home-page "https://surfraw.alioth.debian.org/;)
 (license l:public-domain)))
+
+(define-public gunicorn
+  (package
+(name "gunicorn")
+(version "19.6.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "gunicorn" version))
+   (sha256
+(base32
+ "065n5z91607q4l8wncqkz297cdcb60cz8wnyxy88wk4as4b6jgw1"
+(build-system python-build-system)
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ (add-before 'check 'remove-requirements
+   ; setup.py reads test-requirements from a file which is
+   ; pinning to other versions then guix provides. This also
+   ; enforces optional packages like pytst-cov. So clean the
+   ; list.
+   (lambda _
+ (substitute* "requirements_test.txt"
+   ((".*") "")))
+(native-inputs
+ `(("python-setuptools" ,python-setuptools)
+   ; optional test-requirement pytest-cov used only when running
+   ; setup.y with `test --cov`
+   ("python-pytest" ,python-pytest)))
+(home-page "http://gunicorn.org/;)
+(synopsis "Python WSGI HTTP Server for UNIX")
+(description "Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP
+Server for UNIX.  It’s a pre-fork worker model ported from Ruby’s
+Unicorn project.  The Gunicorn server is broadly compatible with
+various web frameworks, simply implemented, light on server resources,
+and fairly speedy.")
+  (license l:expat)
+  (properties `((python2-variant . ,(delay gunicorn-python2))
+
+(define-public gunicorn-python2
+  (let ((base (package-with-python2
+   (strip-python2-variant gunicorn
+; Note: byte-compiling gunicorn/workers/_gaiohttp.py with Python 2 raises
+; a syntax error, since this is a Python-3-only module. This does not
+; matter since that module is not imported in Python 2 anyway.
+(package
+  (inherit base)
+  (name "gunicorn-python2")
+  (description (string-append (package-description base) "
+
+Use this package if your application is implemented in Python 2."))
+  (native-inputs `(("python2-mock" ,python2-mock)
+   ,@(package-native-inputs base))
-- 
2.7.4

[PATCH 0/2] Updated patches for gunicorn

[Hartmut Goebel]

As discussed, I updated some comments. Additionally I added building teh
documentation (2nd patch).

Hartmut Goebel (2):
  gnu: Add gunicorn and gunicorn-python2.
  gnu: Build documentation for gunicorn and gunicorn-python2.

 gnu/packages/web.scm | 80 
 1 file changed, 80 insertions(+)

-- 
2.7.4

[PATCH 2/2] gnu: Build documentation for gunicorn and gunicorn-python2.

[Hartmut Goebel]

* gnu/packages/web.scm (gunicorn): Add build and install documentation
  (html, info, examples).
---
 gnu/packages/web.scm | 29 +++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 3841c6b..e04cce0 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3648,6 +3648,7 @@ and similar services.")
 (base32
  "065n5z91607q4l8wncqkz297cdcb60cz8wnyxy88wk4as4b6jgw1"
 (build-system python-build-system)
+(outputs '("out" "doc"))
 (arguments
  `(#:phases
(modify-phases %standard-phases
@@ -3658,12 +3659,36 @@ and similar services.")
; list.
(lambda _
  (substitute* "requirements_test.txt"
-   ((".*") "")))
+   ((".*") ""
+ (add-after 'build 'build-doc
+   (lambda _
+ (zero? (system* "make" "-C" "docs" "PAPER=a4"
+ "html" "info"))
+ (delete-file "docs/build/texinfo/Makefile")
+ (delete-file "docs/build/texinfo/Gunicorn.texi")))
+(add-after 'install 'install-doc
+  (lambda* (#:key outputs #:allow-other-keys)
+(let* ((doc (string-append (assoc-ref outputs "doc")
+   "/share/doc/" ,name "-" ,version))
+   (html (string-append doc "/html"))
+   (info (string-append doc "/info"))
+   (examples (string-append doc "/examples")))
+  (mkdir-p html)
+  (mkdir-p info)
+  (mkdir-p examples)
+  (copy-recursively "docs/build/html" html)
+  (copy-recursively "docs/build/texinfo" info)
+  (copy-recursively "examples" examples)
+  (for-each (lambda (file)
+  (copy-file file (string-append doc "/" file)))
+'("README.rst" "NOTICE" "LICENSE" "THANKS"
 (native-inputs
  `(("python-setuptools" ,python-setuptools)
; optional test-requirement pytest-cov used only when running
; setup.y with `test --cov`
-   ("python-pytest" ,python-pytest)))
+   ("python-pytest" ,python-pytest)
+   ("python-sphinx" ,python-sphinx)
+   ("texinfo" ,texinfo)))
 (home-page "http://gunicorn.org/;)
 (synopsis "Python WSGI HTTP Server for UNIX")
 (description "Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP
-- 
2.7.4

Re: User-profile search paths should include system-profile directories

[Alex Kost]

Ludovic Courtès (2016-09-14 16:58 +0200) wrote:

> Hello,
>
> csanchez...@gmail.com (Carlos Sánchez de La Lama) skribis:
>
>> I have an interesting case here. I have guile installed in my system
>> profile, so that
>>
>> /var/guix/profiles/system/profile/share/aclocal/guile.m4
>>
>> is there. However, autoconf is installed in my *user* profile, so
>> ACLOCAL_PATH is augmented in ~/.guix-profile/etc/profile to include
>>
>> ~/.guix-profile/share/aclocal
>>
>> But not the system-profile aclocal directory, which would be put into
>> ACLOCAL_PATH by /var/guix/profiles/system/profile/etc/profile if
>> autoconf was installed in the systme profile as well.
>>
>> Is this the intended behaviour? I am wondering whether packages with
>> search paths should include both the user-profile directories and the
>> system-profile ones.
>
> I think you’re right.  This was discussed at
> , leading to a patch (for GuixSD).
>
> However, we failed to build consensus around the approach of this patch,
> so we did not apply it.  If you have ideas, please email
> 20...@debbugs.gnu.org.  :-)

I think I was the one who prevents the consensus.  To make it clear, I'm
for the suggested solution, but only *after* giving a user a freedom to
avoid loading such a heavy command as "guix package --search-paths".  On
a "usual" GNU/Linux distro a user can edit /etc/profile, but on GuixSD
it is not possible currently.  That's why I think there should be
provided a possibility to override /etc/profile at first.

> One of the fruits of this discussion, though, is that you can do:
>
>   guix package -p /run/current-system/profile -p ~/.guix-profile 
> --search-paths
>
> to get the combined search paths.

This is what I do to combine my profiles (I don't use ~/.guix-profile
but several other profiles instead).

-- 
Alex

Re: [PATCH] gnu: Add emacs-es-mode

[Christopher Baines]

On 14/09/16 15:37, Ludovic Courtès wrote:
> Christopher Baines  skribis:
> 
>> * gnu/packages/emacs.scm (emacs-es-mode): New variable.
> 
> I made minor changes:
> 
>> +(inputs `(("guile" ,guile-2.0)))
> 
> I removed it since it’s unused, AFAICS.
> 
>> +(propagated-inputs
>> + ; The version of org in Emacs 24.5 is not sufficient, and causes
>> + ; tables to be rendered incorrectly
> 
> Use “;;”.
> 
>> +(description "es-mode includes highlighting, completion and indentation
>> +support for Elasticsearch queries.  Also supported are es-mode blocks in
>> +org-mode, for which the results of queries can be processed through jq, or
>> +in the case of aggregations, can be rendered in to a table.  In addition,
>> +there is a es-command-center mode, which displays information about
>> +Elasticsearch clusters")
> 
> Used @code where appropriate and added missing period.
> 
> Pushed as 8bebe734ca54bf83ceae4db0a91f09a706562882, thanks!

Great, thank you :D




signature.asc
Description: OpenPGP digital signature

Re: [PATCH] gnu: Add darkhttpd.

[Arun Isaac]

> I found some tests! See attached. Part of the test suite wants some
> static library from Clang / LLVM; I couldn't make that work in 5 minutes
> so I gave up ;) I think it's okay to commit in this state.

Yeah, the darkhttpd git repo has some test cases, but the release
tarball does not. Since we will be moving to the release tarball once
the release tarball URL problem is fixed upstream, I think we should not
do the test cases.


signature.asc
Description: PGP signature