Re: [PATCH 01/15] gnu: gtk-xfce-engine: Update to 2.10.0.

[Andreas Enge]

On Sun, Mar 01, 2015 at 01:57:12PM +0800, 宋文武 wrote:
> -(version "3.0.0")
> +(version "2.10.0")

Something is suspicious here - a downgrade?

Apart from that, I think you can push without problem updates in which only
the source and the hash change.

Andreas

Re: [PATCH 01/15] gnu: gtk-xfce-engine: Update to 2.10.0.

[宋文武]

Andreas Enge  writes:

> On Sun, Mar 01, 2015 at 01:57:12PM +0800, 宋文武 wrote:
>> -(version "3.0.0")
>> +(version "2.10.0")
>
> Something is suspicious here - a downgrade?
Xfce 4.10 did has a 3.0.0 version.

http://xfce.org/download/changelogs/4.12 has:
Theme Engine (gtk-xfce-engine)
  Gtk+-3 support has been stopped
  
I think that's the reason for a 2.x version.
I feel the commit message or a comment should mention it,
but can't get one myself, any suggestion?

>
> Apart from that, I think you can push without problem updates in which only
> the source and the hash change.
>
> Andreas

Re: [PATCH 01/15] gnu: gtk-xfce-engine: Update to 2.10.0.

[宋文武]

Andreas Enge  writes:

> Apart from that, I think you can push without problem updates in which only
> the source and the hash change.
OK, I leave gtk-xfce-engine and xfconf for review with other pushed.
>
> Andreas

Re: [PATCH 05/15] gnu: exo: Update to 0.10.3.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (exo): Update to 0.10.3.
> ---
>  gnu/packages/xfce.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 7042518..c2386b5 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -162,14 +162,14 @@ to share commonly used Xfce widgets amoung the Xfce 
> applications.")
>  (define-public exo
>(package
>  (name "exo")
> -(version "0.8.0")
> +(version "0.10.3")
>  (source (origin
>(method url-fetch)
> -  (uri (string-append "http://archive.xfce.org/xfce/4.10/src/";
> +  (uri (string-append "http://archive.xfce.org/xfce/4.12/src/";
>name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"1c05pbagw14djv5zmqg34qfj40jav8sd10w2zi2wpzrad4qal8bf"
> +"1g9651ra395v2fmzb943l68b9pg0rfxc19x97a62crchxwa4nw4m"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 03/15] gnu: xfconf: Update to 4.12.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (xfconf): Update to 4.12.0.
>   [arguments]: Add #:phases.  Remove #:parallel-tests? argument.
> ---
>  gnu/packages/xfce.scm | 17 ++---
>  1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 3679eb0..0e45ee4 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -89,7 +89,7 @@ Xfce Desktop Environment.")
>  (define-public xfconf
>(package
>  (name "xfconf")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -97,9 +97,20 @@ Xfce Desktop Environment.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"
> +"0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"
>  (build-system gnu-build-system)
> -(arguments '(#:parallel-tests? #f)) ; parallel tests failed
> +(arguments
> + '(#:phases
> +   ;; Swap check and install phases.
> +   (alist-cons-after
> +'install 'check
> +(lambda _
> +  (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable 
> HOME
> +  ;; Run test-suite under a dbus session.
> +  (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
> +  (string-append %output "/share"))
> +  (zero? (system* "dbus-launch" "make" "check")))
> +(alist-delete 'check %standard-phases

So, tests need to be run *after* installation?  Weird...

>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> ("intltool" ,intltool)))
> -- 
> 2.1.2
>
>

LGTM!

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 04/15] gnu: libxfce4ui: Update to 4.12.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (libxfce4ui): Update to 4.12.0.
> ---
>  gnu/packages/xfce.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 0e45ee4..7042518 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -131,7 +131,7 @@ storage system.")
>  (define-public libxfce4ui
>(package
>  (name "libxfce4ui")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -139,7 +139,7 @@ storage system.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"
> +"11rrhqxnfwx5jls3nlg9s2x8saag9f2zqk9cdm6hr3bs6cr9a781"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 02/15] gnu: libxfce4util: Update to 4.12.1.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (libxfce4util): Update to 4.12.1.
> ---
>  gnu/packages/xfce.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 1be28a7..3679eb0 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -65,7 +65,7 @@
>  (define-public libxfce4util
>(package
>  (name "libxfce4util")
> -(version "4.10.0")
> +(version "4.12.1")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -73,7 +73,7 @@
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89"
> +"07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 06/15] gnu: garcon: Update to 0.4.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (garcon): Update to 0.4.0.
> ---
>  gnu/packages/xfce.scm | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index c2386b5..afc190e 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -193,21 +193,21 @@ development.")
>  (define-public garcon
>(package
>  (name "garcon")
> -(version "0.2.0")
> +(version "0.4.0")
>  (source (origin
>(method url-fetch)
> -  (uri (string-append "http://archive.xfce.org/xfce/4.10/src/";
> +  (uri (string-append "http://archive.xfce.org/xfce/4.12/src/";
>name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2"
> +"0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> ("intltool" ,intltool)
> ("glib:bin" ,glib "bin")))
> -(propagated-inputs `(("glib" ,glib))) ; required by garcon-1.pc
> -(inputs `(("libxfce4util" ,libxfce4util)))
> +(propagated-inputs
> + `(("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk2-1.pc
>  (home-page "http://www.xfce.org/";)
>  (synopsis "Implementation of the freedesktop.org menu specification")
>  (description
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 3/3] gnu: Add ghc.

[Federico Beffa]

Attached a new patch that hopefully addresses the concerns expressed
in this thread:
https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00814.html

I do not create a ready to use bootstrap package because the resulting
store entry amounts to 940MB! I just keep an unmodified fixed version
tarball (68MB) and take care to patch it in custom phases of the final
GHC package. This is to avoid having to transfer almost 1GB of data
each time we need to rebuild GHC (due, e.g., to an update to a
dependency) and is much faster.

I took this route after suffering from extremely long and unreliable
transfers of the TeXLive package. (Yes, I tend to use --no-substitutes
for TeXLive, but when it needs to be transferred as a result of
dependencies things get trickier.).

Regards,
Fede
From c39f2fa29bd614227f501cb83f72e2aa827a9123 Mon Sep 17 00:00:00 2001
From: Federico Beffa 
Date: Wed, 25 Feb 2015 20:20:24 +0100
Subject: [PATCH] gnu: Add ghc.

* gnu/packages/haskell.scm: New file.
---
 gnu/packages/haskell.scm | 222 +++
 1 file changed, 222 insertions(+)
 create mode 100644 gnu/packages/haskell.scm

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
new file mode 100644
index 000..b0630a9
--- /dev/null
+++ b/gnu/packages/haskell.scm
@@ -0,0 +1,222 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Federico Beffa 
+;;;
+;;; 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 haskell)
+  #:use-module (ice-9 regex)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages elf)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages libffi)
+  #:use-module (gnu packages libedit)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages python))
+
+;; We use bootstrap bianries with a fix version which can be used to build
+;; more versions of the GHC compiler.
+(define ghc-bootstrap-7.8.4
+  (origin
+(method url-fetch)
+(uri (string-append "https://www.haskell.org/ghc/dist/";
+"7.8.4/ghc-7.8.4-"
+(if (string-match "x86_64" (%current-system))
+"x86_64"
+"i386")
+"-unknown-linux-deb7.tar.xz"))
+(sha256
+ (base32
+  (if (string-match "x86_64" (%current-system))
+  "13azsl53xgj20mi1hj9x0xb32vvcvs6cpmvwx6znxhas7blh0bpn"
+  "0wj5s435j0zgww70bj1d3f6wvnnpzlxwvwcyh2qv4qjq5z8j64kg")
+
+;; 43 tests out of 3965 fail.
+;;
+;; Most of them do not appear to be serious:
+;;
+;; - some tests generate files referring to "/bin/sh" and "/bin/ls". I've not
+;;   figured out how these references are generated.
+;;
+;; - Some tests allocate more memory than expected (ca. 3% above upper limit)
+;;
+;; - Some tests try to load unavailable libriries: Control.Concurrent.STM,
+;;   Data.Vector, Control.Monad.State.
+;;
+;; - Test posix010 tries to check the existence of a user on the system:
+;;   getUserEntryForName: does not exist (no such user)
+(define-public ghc
+  (package
+(name "ghc")
+(version "7.8.4")
+(source
+ (origin
+  (method url-fetch)
+  (uri (string-append "https://www.haskell.org/ghc/dist/";
+  version "/" name "-" version "-src.tar.xz"))
+  (sha256
+   (base32
+"1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"
+(build-system gnu-build-system)
+(supported-systems '("i686-linux" "x86_64-linux"))
+(outputs '("out" "doc"))
+(inputs
+ `(("gmp" ,gmp)
+   ("ncurses" ,ncurses)
+   ("libffi" ,libffi)
+   ("libedit" ,libedit)
+   ("ghc-testsuite"
+,(origin
+   (method url-fetch)
+   (uri (string-append
+ "https://www.haskell.org/ghc/dist/";
+ version "/" name "-" version "-testsuite.tar.xz"))
+   (sha256
+(base32
+ "0q95whf87y4mxjzwzy899g7z7l9pazq4si6iciyhxkcdhqq2ycyh"))
+(native-inputs
+ `(("perl" ,perl)
+   ("python" ,python-2); for tests (fails with pyt

Re: [PATCH 01/15] gnu: gtk-xfce-engine: Update to 2.10.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (gtk-xfce-engine): Update to 2.10.0.
> ---
>  gnu/packages/xfce.scm | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index fb5427c..1be28a7 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -1,5 +1,5 @@
>  ;;; GNU Guix --- Functional package management for GNU
> -;;; Copyright © 2014 Sou Bunnbu 
> +;;; Copyright © 2014, 2015 Sou Bunnbu 
>  ;;; Copyright © 2014 Mark H Weaver 
>  ;;;
>  ;;; This file is part of GNU Guix.
> @@ -43,14 +43,14 @@
>  (define-public gtk-xfce-engine
>(package
>  (name "gtk-xfce-engine")
> -(version "3.0.0")
> +(version "2.10.0")
>  (source (origin
>(method url-fetch)
> -  (uri (string-append "http://archive.xfce.org/xfce/4.10/src/";
> +  (uri (string-append "http://archive.xfce.org/xfce/4.12/src/";
>name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"13c3ajfqkdr6jlqjyhcp4nls0ddanypr83q9qib2ciffik78zq4h"
> +"0rqrnjxx1lzla7wp2fadyixs6jy0js6xh005pgwyqbigpl0v7hy1"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 08/15] gnu: xfce4-panel: Update to 4.12.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (xfce4-panel): Update to 4.12.0.
> ---
>  gnu/packages/xfce.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 94198c6..0d247be 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -255,7 +255,7 @@ management D-Bus specification.")
>  (define-public xfce4-panel
>(package
>  (name "xfce4-panel")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -263,7 +263,7 @@ management D-Bus specification.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"1f8903nx6ivzircl8d8s9zna4vjgfy0qhjk5d2x19g9bmycgj89k"))
> +"1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih"))
>(patches (list (search-patch "xfce4-panel-plugins.patch")
>  (build-system gnu-build-system)
>  (native-inputs
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 07/15] gnu: tumbler: Update to 0.1.31.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (tumbler): Update to 0.1.31.
> ---
>  gnu/packages/xfce.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index afc190e..94198c6 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -220,14 +220,14 @@ merging features essential for loading menus modified 
> with menu editors.")
>  (define-public tumbler
>(package
>  (name "tumbler")
> -(version "0.1.30")
> +(version "0.1.31")
>  (source (origin
>(method url-fetch)
>(uri (string-append 
> "http://archive.xfce.org/src/xfce/tumbler/0.1/";
>name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"013kacqyy1vya7kp6jgc1almp3cbbvq96a3r7f5myiihr1whvhp7"
> +"0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 09/15] gnu: xfce4-appfinder: Update to 4.12.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (xfce4-appfinder): Update to 4.12.0.
> ---
>  gnu/packages/xfce.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 0d247be..3b0f9f2 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -320,7 +320,7 @@ applications menu, workspace switcher and more.")
>  (define-public xfce4-appfinder
>(package
>  (name "xfce4-appfinder")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -328,7 +328,7 @@ applications menu, workspace switcher and more.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"0falckrziw8m1a72nxd7fqq84r3xfbrb6lv35flsca346rzawah4"
> +"0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 10/15] gnu: xfce4-session: Update to 4.12.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (xfce4-session): Update to 4.12.0.
> ---
>  gnu/packages/xfce.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 3b0f9f2..40f75aa 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -346,7 +346,7 @@ your system in categories, so you can quickly find and 
> launch them.")
>  (define-public xfce4-session
>(package
>  (name "xfce4-session")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -354,7 +354,7 @@ your system in categories, so you can quickly find and 
> launch them.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv"
> +"01kvbd09c06j20n155hracsgrq06rlmfgdywffjsvlwpn19m9j38"
>  (build-system gnu-build-system)
>  (arguments
>   '(#:configure-flags
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 11/15] gnu: xfce4-settings: Update to 4.12.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (xfce4-settings): Update to 4.12.0.
> ---
>  gnu/packages/xfce.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 40f75aa..1c45c20 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -377,7 +377,7 @@ allows you to shutdown the computer from Xfce.")
>  (define-public xfce4-settings
>(package
>  (name "xfce4-settings")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -385,7 +385,7 @@ allows you to shutdown the computer from Xfce.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"0zppq747z9lrxyv5zrrvpalq7hb3gfhy9p7qbldisgv7m6dz0hq8"
> +"108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 12/15] gnu: thunar: Update to 1.6.6.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (thunar): Update to 1.6.6.
> ---
>  gnu/packages/xfce.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 1c45c20..a5422c4 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -408,14 +408,14 @@ like appearance, display, keyboard and mouse settings.")
>  (define-public thunar
>(package
>  (name "thunar")
> -(version "1.4.0")
> +(version "1.6.6")
>  (source (origin
>(method url-fetch)
> -  (uri (string-append "http://archive.xfce.org/xfce/4.10/src/";
> +  (uri (string-append "http://archive.xfce.org/xfce/4.12/src/";
>"Thunar-" version ".tar.bz2"))
>(sha256
> (base32
> -"1fn8wjzkfvnx2giv3rrg2cyrr2c96f9mskgvcji0ixyfcjga249c"
> +"1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 13/15] gnu: thunar-volman: Update to 0.8.1.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (thunar-volman): Update to 0.8.1.
> ---
>  gnu/packages/xfce.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index a5422c4..0f8de9d 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -439,14 +439,14 @@ fast.")
>  (define-public thunar-volman
>(package
>  (name "thunar-volman")
> -(version "0.8.0")
> +(version "0.8.1")
>  (source (origin
>(method url-fetch)
> -  (uri (string-append "http://archive.xfce.org/xfce/4.10/src/";
> +  (uri (string-append "http://archive.xfce.org/xfce/4.12/src/";
>name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"
> +"1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 14/15] gnu: xfwm4: Update to 4.12.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (xfwm4): Update to 4.12.0.
>   Add 'libdrm' and 'libxdamage' to inputs.
> ---
>  gnu/packages/xfce.scm | 12 +++-
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 0f8de9d..7d93de7 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -469,7 +469,7 @@ and import the new pictures from your camera.")
>  (define-public xfwm4
>(package
>  (name "xfwm4")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -477,16 +477,18 @@ and import the new pictures from your camera.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"170zzs7adj47srsi2cl723w9pl8k8awd7w1bpzxby7hj92zmf8s9"
> +"0fnc2ps4k733n9qfpxrz047h1myyqjzxczl7fmkjmqwshvicpx19"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> ("intltool" ,intltool)))
>  (inputs
> - `(("libwnck", libwnck-1)
> + `(("libdrm" ,libdrm)
> +   ("libwnck" ,libwnck-1)
> +   ("libxcomposite" ,libxcomposite)
> +   ("libxdamage" ,libxdamage)
> ("libxfce4ui" ,libxfce4ui)
> -   ("libxrandr" ,libxrandr)
> -   ("libxcomposite" ,libxcomposite)))
> +   ("libxrandr" ,libxrandr)))
>  (home-page "http://www.xfce.org/";)
>  (synopsis "Xfce window manager")
>  (description
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 15/15] gnu: xfdesktop: Update to 4.12.0.

[David Thompson]

宋文武  writes:

> * gnu/packages/xfce.scm (xfdesktop): Update to 4.12.0.
> ---
>  gnu/packages/xfce.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 7d93de7..6e24a9a 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -499,7 +499,7 @@ on the screen.")
>  (define-public xfdesktop
>(package
>  (name "xfdesktop")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -507,7 +507,7 @@ on the screen.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"0yrddj1lgk3xn4w340y89z7x2isks72ia36pka08kk2x8gpfcyl9"
> +"1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf"
>  (build-system gnu-build-system)
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> -- 
> 2.1.2
>
>

LGTM.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 2/2] gnu: Add AlsaModularSynth.

[Ricardo Wurmus]

> Luckily, AMS could also be built against clalsadrv, the deprecated
> predecessor of zita-alsa-pcmi.  I'll package that up and replace the
> input for alsa-modular-synth.

Attached are updated patches for AMS with clalsadrv.

~~ Ricardo

>From dbf194fdfd5baf9b79ebc7ba3c60835421cce12a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 1 Mar 2015 13:35:06 +0100
Subject: [PATCH 1/2] gnu: Add clalsadrv.

* gnu/packages/audio.scm (clalsadrv): New variable.
---
 gnu/packages/audio.scm | 43 +++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ac6bc25..b7e74ca 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -199,6 +199,49 @@ bass section with five drawbars.  A standalone JACK application and LV2
 plugins are provided.")
 (license license:gpl2)))
 
+(define-public clalsadrv
+  (package
+(name "clalsadrv")
+(version "2.0.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"http://kokkinizita.linuxaudio.org";
+"/linuxaudio/downloads/clalsadrv-"
+version ".tar.bz2"))
+  (sha256
+   (base32
+"0bsacx3l9065gk8g4137qmz2ij7s9x06aldvacinzlcslw7bd1kq"))
+  (modules '((guix build utils)))
+  (snippet
+   '(substitute* "libs/Makefile"
+  (("/sbin/ldconfig") "true")
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; no "check" target
+   #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+   #:phases
+   (alist-cons-after
+'unpack
+'enter-directory
+(lambda _ (chdir "libs"))
+(alist-cons-after
+ 'install
+ 'install-symlink
+ (lambda _
+   (symlink "libclalsadrv.so"
+(string-append (assoc-ref %outputs "out")
+   "/lib/libclalsadrv.so.2")))
+ ;; no configure script
+ (alist-delete 'configure %standard-phases)
+(inputs
+ `(("alsa-lib" ,alsa-lib)
+   ("fftw" ,fftw)))
+(home-page "http://kokkinizita.linuxaudio.org";)
+(synopsis "C++ wrapper around the ALSA API")
+(description "clalsadrv is a C++ wrapper around the ALSA API.")
+(license license:gpl2+)))
+
 (define-public freepats
   (package
 (name "freepats")
-- 
2.1.0

>From 40b455e2008c149d708c2e31ec883d90b943b032 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 21 Feb 2015 21:53:02 +0100
Subject: [PATCH 2/2] gnu: Add AlsaModularSynth.

* gnu/packages/audio.scm (alsa-modular-synth): New variable.
---
 gnu/packages/audio.scm | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b7e74ca..a9c66d1 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -53,6 +53,40 @@
   #:use-module (gnu packages xml)
   #:use-module (srfi srfi-1))
 
+(define-public alsa-modular-synth
+  (package
+(name "alsa-modular-synth")
+(version "2.1.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "mirror://sourceforge/alsamodular/ams-"
+  version ".tar.bz2"))
+  (sha256
+   (base32
+"1nb7qzzqlqa2x8h797jbwi18ihnfkxqg9lyi0c4nvf8ybwzxkzd2"
+(build-system gnu-build-system)
+(inputs
+ `(("alsa-lib" ,alsa-lib)
+   ;; We cannot use zita-alsa-pcmi (the successor of clalsadrv) due to
+   ;; license incompatibility.
+   ("clalsadrv" ,clalsadrv)
+   ("fftw" ,fftw)
+   ("jack" ,jack-1)
+   ("ladspa" ,ladspa)
+   ("liblo" ,liblo)
+   ("qt" ,qt-4)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(home-page "http://alsamodular.sourceforge.net/";)
+(synopsis "Realtime modular synthesizer and effect processor")
+(description
+ "AlsaModularSynth is a digital implementation of a classical analog
+modular synthesizer system.  It uses virtual control voltages to control the
+parameters of the modules.  The control voltages which control the frequency
+e.g. of the VCO (Voltage Controlled Oscillator) and VCF (Voltage Controlled
+Filter) modules follow the convention of 1V / Octave.")
+(license license:gpl2)))
+
 (define-public aubio
   (package
 (name "aubio")
-- 
2.1.0

Re: [PATCH 3/3] gnu: Add ghc.

[Ludovic Courtès]

Federico Beffa  skribis:

> I do not create a ready to use bootstrap package because the resulting
> store entry amounts to 940MB! I just keep an unmodified fixed version
> tarball (68MB) and take care to patch it in custom phases of the final
> GHC package.

Sounds good.

> From c39f2fa29bd614227f501cb83f72e2aa827a9123 Mon Sep 17 00:00:00 2001
> From: Federico Beffa 
> Date: Wed, 25 Feb 2015 20:20:24 +0100
> Subject: [PATCH] gnu: Add ghc.
>
> * gnu/packages/haskell.scm: New file.

[...]

> +;; 43 tests out of 3965 fail.
> +;;
> +;; Most of them do not appear to be serious:
> +;;
> +;; - some tests generate files referring to "/bin/sh" and "/bin/ls". I've not
> +;;   figured out how these references are generated.
> +;;
> +;; - Some tests allocate more memory than expected (ca. 3% above upper limit)
> +;;
> +;; - Some tests try to load unavailable libriries: Control.Concurrent.STM,
> +;;   Data.Vector, Control.Monad.State.
> +;;
> +;; - Test posix010 tries to check the existence of a user on the system:
> +;;   getUserEntryForName: does not exist (no such user)

All these seem workable: #1 and #4 should be easily fixed by adjusting
to the specifics of our build environment, and #2 and #3 might just need
to be skipped.  But let’s get this patch in first.  :-)

[...]

> +(substitute* (list "testsuite/timeout/Makefile"
> +   "testsuite/timeout/timeout.py"
> +   "testsuite/timeout/timeout.hs"
> +   "testsuite/tests/rename/prog006/Setup.lhs"
> +   
> "testsuite/tests/programs/life_space_leak/life.test")
> +  (("/bin/sh") (which "sh"))
> +  (("/bin/rm") "rm"))

Perhaps (find-files "testsuite" ".*") would be enough?

> +;; We need to set the locale for the tests to produce results
> +;; identical to the expected ones.

s/set the locale/install a UTF-8 locale/ (presumably.)

[...]

> +   (alist-cons-before
> +'configure 'install-bin

This phase installs bootstrap binaries to $out/bin and adds them to
$PATH, right?  Wouldn’t it be enough to install them to $TMPDIR/bin and
add that to $PATH?

> +(lambda* (#:key inputs outputs #:allow-other-keys)
> +  (let* ((binaries
> +  (list
> +   "./utils/ghc-pwd/dist-install/build/tmp/ghc-pwd"
> +   "./utils/hpc/dist-install/build/tmp/hpc"
> +   "./utils/haddock/dist/build/tmp/haddock"
> +   "./utils/hsc2hs/dist-install/build/tmp/hsc2hs"
> +   "./utils/runghc/dist-install/build/tmp/runghc"
> +   "./utils/ghc-cabal/dist-install/build/tmp/ghc-cabal"
> +   "./utils/hp2ps/dist/build/tmp/hp2ps"
> +   "./utils/ghc-pkg/dist-install/build/tmp/ghc-pkg"
> +   "./utils/unlit/dist/build/tmp/unlit"
> +   "./ghc/stage2/build/tmp/ghc-stage2"))

Could we just list base names and do

  (append-map (lambda (program)
(find-files "." (string-append "^" program "$")))
  '("ghc-pwd" "hpc" ...))

> + (ld-so (string-append (assoc-ref inputs "libc")
> +   "/lib/ld-linux-x86-64.so.2"))

Please use ,(glibc-dynamic-linker) for the base name.


[...]

> +  (system* (string-append (getcwd) "/configure")
> +   (string-append "--prefix=" ghc-bootstrap-prefix)
> +   (string-append "--with-gmp-libraries=" gmp-lib)
> +   (string-append "--with-gmp-includes=" 
> gmp-include))
> +  (setenv "PATH"
> +  (string-append (getenv "PATH") ":"
> + ghc-bootstrap-prefix "/bin"))
> +  (zero? (system* "make" "install")

Perhaps move “make install” to a separate phase?

Thanks for the great work!

Eventually we should move Hugs to haskell.scm as well.

Ludo’.

Re: [PATCH 2/2] gnu: Add AlsaModularSynth.

[Ludovic Courtès]

Ricardo Wurmus  skribis:

> From dbf194fdfd5baf9b79ebc7ba3c60835421cce12a Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus 
> Date: Sun, 1 Mar 2015 13:35:06 +0100
> Subject: [PATCH 1/2] gnu: Add clalsadrv.
>
> * gnu/packages/audio.scm (clalsadrv): New variable.

[...]

> +(home-page "http://kokkinizita.linuxaudio.org";)
> +(synopsis "C++ wrapper around the ALSA API")
> +(description "clalsadrv is a C++ wrapper around the ALSA API.")

Please expound a bit on the description such that one can have some
answer to “why would one want to wrap ALSA?”.  Is just C++ bindings that
provide an idiomatic C++ API?

OK to push with an appropriate description.

[...]

> From 40b455e2008c149d708c2e31ec883d90b943b032 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus 
> Date: Sat, 21 Feb 2015 21:53:02 +0100
> Subject: [PATCH 2/2] gnu: Add AlsaModularSynth.
>
> * gnu/packages/audio.scm (alsa-modular-synth): New variable.

OK!

Thanks!

Ludo’.

Re: [ART] Updated SLiM theme with GuixSD logo

[Ludovic Courtès]

Luis Felipe López Acevedo  skribis:

> El jue, 12-02-2015 a las 23:34 +0100, Ricardo Wurmus escribió:
>
> [...]
>
>> - The SLiM theme is blue whereas the GRUB theme (and the colour theme of
>>   Ludo's slides) is orange.  Will the SLiM theme's colours eventually be
>>   adjusted?
>> 
>
> I made the SLiM theme use the same default desktop background to provide
> a smooth transition to the desktop after logging on (in a default
> installation).
>
> But I'm not against using black/orange backgrounds on GRUB and SLiM. I
> attach an example.

So, what about using the black-background version for SLiM?  You seemed
to be slightly reluctant to that maybe?

Thanks,
Ludo’.

[PATCH] gnu: Add xbindkeys

[Mathieu Lirzin]

Hi Guix,

Here is a patch adding XBindKeys. When building everything was
fine except one configure warning:

> configure: WARNING: unrecognized options: --enable-fast-install
> phase `configure' succeeded after 6 seconds

Does this require any change in the package definition?

--
Mathieu Lirzin

>From 9575b2143ea761a2425e53ae227d3ade37c7c128 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin 
Date: Sun, 1 Mar 2015 14:12:41 +0100
Subject: [PATCH] gnu: Add xbindkeys

* gnu/packages/xdisorg.scm (xbindkeys): New variable.
---
 gnu/packages/xdisorg.scm | 33 +
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d0c983d..2ba6d0b 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014 Eric Bavier 
 ;;; Copyright © 2014, 2015 Alex Kost 
 ;;; Copyright © 2013, 2015 Ludovic Courtès 
+;;; Copyright © 2015 Mathieu Lirzin 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +33,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages xorg))
 
 ;; packages outside the x.org system proper
@@ -420,3 +422,34 @@ X Window System.")
  "XOSD provides a C library and a simple utility (osd_cat) for displaying
 transparent text on your screen.")
 (license license:gpl2+)))
+
+(define-public xbindkeys
+  (package
+(name "xbindkeys")
+(version "1.8.6")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"http://www.nongnu.org/xbindkeys/xbindkeys-";
+version
+".tar.gz"))
+  ;; Download from the savannah mirror list fails
+  (sha256
+   (base32
+"060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"
+(build-system gnu-build-system)
+(inputs
+ `(("libx11" ,libx11)
+   ("guile" ,guile-2.0)))
+(home-page "http://www.nongnu.org/xbindkeys/";)
+(synopsis "Associate a combination of keys with a shell command")
+(description
+ "XBindKeys is a program that allows you to launch shell commands with
+your keyboard or your mouse under the X Window System.  It links commands to
+keys or mouse buttons, using a configuration file.  It's independent of the
+window manager and can capture all keyboard keys (ex: Power, Wake...).  It
+optionally supports a guile-based configuration file layout, which enables you
+to access all XBindKeys internals, so you can have key combinations, double
+clicks or timed double clicks take actions.  Also all functions that work in
+guile will work for XBindKeys.")
+(license license:gpl2+)))
-- 
2.1.4

Re: [PATCH] gnu: Add xbindkeys

[David Thompson]

Mathieu Lirzin  writes:

> Here is a patch adding XBindKeys. When building everything was
> fine except one configure warning:
>
>> configure: WARNING: unrecognized options: --enable-fast-install
>> phase `configure' succeeded after 6 seconds
>
> Does this require any change in the package definition?

No.  It's benign.

A few minor comments below:

>
> From 9575b2143ea761a2425e53ae227d3ade37c7c128 Mon Sep 17 00:00:00 2001
> From: Mathieu Lirzin 
> Date: Sun, 1 Mar 2015 14:12:41 +0100
> Subject: [PATCH] gnu: Add xbindkeys
>
> * gnu/packages/xdisorg.scm (xbindkeys): New variable.
> ---
>  gnu/packages/xdisorg.scm | 33 +
>  1 file changed, 33 insertions(+)
>
> diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
> index d0c983d..2ba6d0b 100644
> --- a/gnu/packages/xdisorg.scm
> +++ b/gnu/packages/xdisorg.scm
> @@ -4,6 +4,7 @@
>  ;;; Copyright © 2014 Eric Bavier 
>  ;;; Copyright © 2014, 2015 Alex Kost 
>  ;;; Copyright © 2013, 2015 Ludovic Courtès 
> +;;; Copyright © 2015 Mathieu Lirzin 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -32,6 +33,7 @@
>#:use-module (gnu packages glib)
>#:use-module (gnu packages perl)
>#:use-module (gnu packages linux)
> +  #:use-module (gnu packages guile)
>#:use-module (gnu packages xorg))
>  
>  ;; packages outside the x.org system proper
> @@ -420,3 +422,34 @@ X Window System.")
>   "XOSD provides a C library and a simple utility (osd_cat) for displaying
>  transparent text on your screen.")
>  (license license:gpl2+)))
> +
> +(define-public xbindkeys
> +  (package
> +(name "xbindkeys")
> +(version "1.8.6")
> +(source (origin
> +  (method url-fetch)
> +  (uri (string-append
> +"http://www.nongnu.org/xbindkeys/xbindkeys-";
> +version
> +".tar.gz"))
> +  ;; Download from the savannah mirror list fails

Move this comment above the 'uri' field.

> +  (sha256
> +   (base32
> +"060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"
> +(build-system gnu-build-system)
> +(inputs
> + `(("libx11" ,libx11)
> +   ("guile" ,guile-2.0)))

Ooh, it's extensible with Guile! :)

> +(home-page "http://www.nongnu.org/xbindkeys/";)
> +(synopsis "Associate a combination of keys with a shell command")
> +(description
> + "XBindKeys is a program that allows you to launch shell commands with
> +your keyboard or your mouse under the X Window System.  It links commands to
> +keys or mouse buttons, using a configuration file.  It's independent of the
> +window manager and can capture all keyboard keys (ex: Power, Wake...).  It
> +optionally supports a guile-based configuration file layout, which enables 
> you
> +to access all XBindKeys internals, so you can have key combinations, double
> +clicks or timed double clicks take actions.  Also all functions that work in
> +guile will work for XBindKeys.")

Capitalize "guile" where it appears.

> +(license license:gpl2+)))
> -- 
> 2.1.4
>

Looking good, thanks!

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH] gnu: Add xbindkeys

[Mathieu Lirzin]

Thanks for your review David, here is the updated patch.

--
Mathieu Lirzin

>From eaa6fa42811fb5a5e6ce69f9c7a83b891d1c160d Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin 
Date: Sun, 1 Mar 2015 14:12:41 +0100
Subject: [PATCH] gnu: Add xbindkeys

* gnu/packages/xdisorg.scm (xbindkeys): New variable.
---
 gnu/packages/xdisorg.scm | 33 +
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d0c983d..67aa34a 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014 Eric Bavier 
 ;;; Copyright © 2014, 2015 Alex Kost 
 ;;; Copyright © 2013, 2015 Ludovic Courtès 
+;;; Copyright © 2015 Mathieu Lirzin 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +33,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages xorg))
 
 ;; packages outside the x.org system proper
@@ -420,3 +422,34 @@ X Window System.")
  "XOSD provides a C library and a simple utility (osd_cat) for displaying
 transparent text on your screen.")
 (license license:gpl2+)))
+
+(define-public xbindkeys
+  (package
+(name "xbindkeys")
+(version "1.8.6")
+(source (origin
+  (method url-fetch)
+  ;; Download from the savannah mirror list fails
+  (uri (string-append
+"http://www.nongnu.org/xbindkeys/xbindkeys-";
+version
+".tar.gz"))
+  (sha256
+   (base32
+"060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"
+(build-system gnu-build-system)
+(inputs
+ `(("libx11" ,libx11)
+   ("guile" ,guile-2.0)))
+(home-page "http://www.nongnu.org/xbindkeys/";)
+(synopsis "Associate a combination of keys with a shell command")
+(description
+ "XBindKeys is a program that allows you to launch shell commands with
+your keyboard or your mouse under the X Window System.  It links commands to
+keys or mouse buttons, using a configuration file.  It's independent of the
+window manager and can capture all keyboard keys (ex: Power, Wake...).  It
+optionally supports a Guile-based configuration file layout, which enables you
+to access all XBindKeys internals, so you can have key combinations, double
+clicks or timed double clicks take actions.  Also all functions that work in
+Guile will work for XBindKeys.")
+(license license:gpl2+)))
-- 
2.1.4

Re: [ART] Updated SLiM theme with GuixSD logo

[felipe . lopez]

On 2015-03-01 10:14, l...@gnu.org wrote:

Luis Felipe López Acevedo  skribis:


El jue, 12-02-2015 a las 23:34 +0100, Ricardo Wurmus escribió:

[...]

- The SLiM theme is blue whereas the GRUB theme (and the colour theme 
of
  Ludo's slides) is orange.  Will the SLiM theme's colours eventually 
be

  adjusted?



I made the SLiM theme use the same default desktop background to 
provide

a smooth transition to the desktop after logging on (in a default
installation).

But I'm not against using black/orange backgrounds on GRUB and SLiM. I
attach an example.


So, what about using the black-background version for SLiM?  You seemed
to be slightly reluctant to that maybe?

Thanks,
Ludo’.


Ah, sorry, I got distracted with the website design and never pushed the 
black version to the repository. I'll do this today.


I'm fine with any of the versions, really. So I'll leave the decision to 
you :)

Re: [PATCH] gnu: Add xbindkeys

[David Thompson]

Mathieu Lirzin  writes:

> Thanks for your review David, here is the updated patch.

Looks good!  I just added a period to the end of the commit log and
pushed.

Thanks!

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: Locale of build environments

[Ludovic Courtès]

l...@gnu.org (Ludovic Courtès) skribis:

> Besides, commit e8c9f04 is interesting: ‘substitute*’ will now break
> non-UTF-8 files by defaults (replacing invalid UTF-8 sequences with
> question marks in the output.)

Based on that observation, commit dd0a8ef forced the ‘patch-*’
procedures to treat files as if they were ISO-8859-1–i.e., leaving their
byte sequence uninterpreted, and thus avoiding multibyte sequence
decoding errors.

Then, as Mark suggested, commit 4db8716 forces strict encoding/decoding
errors.

The problem then is that we’re getting things like
:

--8<---cut here---start->8---
phase `unpack' succeeded after 0 seconds
starting phase `patch-usr-bin-file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
patch-/usr/bin/file: ./configure: changing `/usr/bin/file' to 
`/gnu/store/a31g38iykai59jqmcwknxyjddc5zxm9b-file-5.22/bin/file'
Backtrace:

[...]

 745: 10 [patch-/usr/bin/file "./configure" #:file-command ...]
In ice-9/boot-9.scm:
 171: 9 [with-throw-handler #t ...]
 867: 8 [call-with-input-file "./configure" ...]
In 
/gnu/store/wcrp88qjv5bfhwcsxhbiqfh29da8pg81-module-import/guix/build/utils.scm:
 474: 7 [# #]
 500: 6 [# # ...]
In srfi/srfi-1.scm:
 465: 5 [fold # ...]
In 
/gnu/store/wcrp88qjv5bfhwcsxhbiqfh29da8pg81-module-import/guix/build/utils.scm:
 503: 4 [# # ...]
In ice-9/regex.scm:
 189: 3 [list-matches # ...]
 176: 2 [fold-matches # ...]
In unknown file:
   ?: 1 [regexp-exec # ...]
In ice-9/boot-9.scm:
 106: 0 [# 
encoding-error ...]

ice-9/boot-9.scm:106:20: In procedure #:
ice-9/boot-9.scm:106:20: Throw to key `encoding-error' with args 
`("scm_to_stringn" "cannot convert narrow string to output locale" 84 #f #f)'.
--8<---cut here---end--->8---

The failure here occurs when using ‘guile-final’ (which has full iconv
support.)  When it stumbles upon the © sign in ‘configure’, it reads it,
with ‘read-line’, as the sequence #\302 #\251.

However, when passing that line back to ‘regexp-exec’, ‘regex-exec’
calls ‘scm_to_locale_string’ on it, which fails with the error above:
this is because, in this build, we’re running on the C locale and #\302
aka. #\Â cannot be represented in ASCII (the encoding of the C locale.)

To solve that problem, commit 87c8b92 makes UTF-8 locales available
right after ‘guile-final’ is built.  That way, calls to
‘scm_to_locale_string’ actually convert to UTF-8, which always work.

(Note that the bootstrap Guile doesn’t have this problem because it uses
UTF-8 for everything and ignores locale settings.)

Hopefully we can enable full builds of ‘core-updates’ very soon now.

Ludo’.

Re: [PATCH 1/5] gnu: Add efl.

[Andreas Enge]

Hello,

On Sat, Feb 28, 2015 at 11:11:02PM +0100, Tomáš Čech wrote:
> +(propagated-inputs
> + ; all these inputs are in package config files in section
> + ; Require.private

I was under the impression that only libraries given as "Require" needed
to be propagated, and not "Require.private" ones. Maybe someone else can
comment?

You could also try to move them to normal inputs and see whether another
package depending on efl still compiles.

Andreas

Re: [PATCH 1/5] gnu: Add efl.

[tcech]

Hello,

On Sun, Mar 01, 2015 at 08:24:54PM +0100, Andreas Enge wrote:

Hello,

On Sat, Feb 28, 2015 at 11:11:02PM +0100, Tomáš Čech wrote:

+(propagated-inputs
+ ; all these inputs are in package config files in section
+ ; Require.private


I was under the impression that only libraries given as "Require" needed
to be propagated, and not "Require.private" ones. Maybe someone else can
comment?


I don't know pkgconfig much, but when in later packages in configure
tests presence with

$PKG_CONFIG --exists --print-errors "somepackage >= version"

Missing libraries from Require.private leads to failure of configure.


You could also try to move them to normal inputs and see whether another
package depending on efl still compiles.


I'm afraid that I found what propagated-input is thanks to this. I'm
sure that elementary or others won't build without that.

Maybe I misunderstand the problem though.

S_W


pgpLheJPvXb4U.pgp
Description: PGP signature

Re: [PATCH 1/5] gnu: Add efl.

[Andreas Enge]

On Sun, Mar 01, 2015 at 08:43:09PM +0100, tc...@suse.cz wrote:
> On Sun, Mar 01, 2015 at 08:24:54PM +0100, Andreas Enge wrote:
> >You could also try to move them to normal inputs and see whether another
> >package depending on efl still compiles.
> I'm afraid that I found what propagated-input is thanks to this. I'm
> sure that elementary or others won't build without that.

Sorry, what I suggested as a test actually does not work. The question is:
Does everything built with efl requires the additional libraries, or may
there be packages building with efl, but without these additional libraries?
Of course, no finite number of examples constitutes a proof...

I found the following:
   http://people.freedesktop.org/~dbn/pkg-config-guide.html
Requires: A list of packages required by this package. The versions of these 
packages may be specified using the comparison operators =, <, >, <= or >=.
Requires.private: A list of private packages required by this package but not 
exposed to applications. The version specific rules from the Requires field 
also apply here.

This sounds as if only "Requires" libraries need to be propagated, whereas
"Requires.private" libraries are already handled by our ld wrapper.

The page above links to the following:
   https://wiki.openmandriva.org/en/Overlinking_issues_in_packaging

This seems to confirm my opinion, but it would be good if someone more
knowledgeable on pkg-config could comment on the issue.

Andreas

Re: [PATCH 1/5] gnu: Add efl.

[Ludovic Courtès]

Andreas Enge  skribis:

> I was under the impression that only libraries given as "Require" needed
> to be propagated, and not "Require.private" ones. Maybe someone else can
> comment?

It’s worth propagating in both cases.  “Require.private” is used for
static linking only, as in ‘pkg-config foo --libs --static’.

Ludo’.

Python ignores pth files?

[Ricardo Wurmus]

Hi Guix,

I'm currently attempting to package GNU Solfege, a Python application
using PyGTK which uses the gnu-build-system.  Attached is the current
state of my changes.

I need to wrap the executable /bin/solfege to make sure that the
PYTHONPATH is set such that pygtk, pygobject, pycairo and so on can be
found.  Unfortunately, even with the wrapper solfege fails because it
cannot find pygtk:

   Traceback (most recent call last):
 File 
"/gnu/store/mq8zh2ajimn91hsxkrvf2a5pyi0v6gjs-solfege-3.22.2/bin/.solfege-real", 
line 55, in 
   from solfege import presetup
 File 
"/gnu/store/mq8zh2ajimn91hsxkrvf2a5pyi0v6gjs-solfege-3.22.2/share/solfege/solfege/presetup.py",
 line 22, in 
   import gtk
   ImportError: No module named gtk

With strace I see that python attempts to load the gtk module from all
the places specified in the PYTHONPATH (and a few more), but it does not
actually enter the "gtk-2.0" subdirectory declared by the pygtk.pth
file.

When I explicitly add
/gnu/store/...-pygtk../lib/python2.7/site-packages/gtk-2.0 to PYTHONPATH
the application progresses a little further and then fails to load
"gio", which is also located in a "gtk-2.0" subdirectory rather than the
root of a "site-packages" directory.

pygtk and pygobject both come with .pth files that instruct Python to
check out the "gtk-2.0" subdirectory, yet these files are seemingly
ignored as (according to strace) Python makes no attempt to look inside
the declared subdirectories when Solfege starts up.

I would be glad for any insights you might be able to share.

~~ Ricardo

>From 4984cd4303ba59d07a672e226d54a9569d4770cd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 1 Mar 2015 21:10:48 +0100
Subject: [PATCH] WIP: Add solfege

---
 gnu/packages/audio.scm | 64 ++
 1 file changed, 64 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 5a23618..6bb7ccc 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -35,12 +35,15 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages file)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages mp3) ;taglib
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -48,6 +51,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages texinfo)
   #:use-module (gnu packages which)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
@@ -717,6 +721,66 @@ and ALSA.")
 tempo and pitch of an audio recording independently of one another.")
 (license license:gpl2+)))
 
+(define-public solfege
+  (package
+(name "solfege")
+(version "3.22.2")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"mirror://gnu/solfege/solfege-"
+version ".tar.xz"))
+  (sha256
+   (base32
+"1w25rxdbj907nsx285k9nm480pvy12w3yknfh4n1dfv17cwy072i"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; xmllint attempts to download DTD
+   #:test-target "test"
+   #:phases
+   (alist-cons-before
+'build 'patch-python-shebangs
+(lambda _
+  (substitute* (find-files "solfege" ".*\\.py")
+(("#!/usr/bin/python") (string-append "#!" (which "python")
+(alist-cons-after
+ 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+   ;; Make sure 'solfege' can import 'pygtk'.
+   (let* ((out (assoc-ref outputs "out"))
+  (pygtk (assoc-ref inputs "pygtk"))
+  (path (getenv "PYTHONPATH")))
+ (wrap-program (string-append out "/bin/solfege")
+   `("PYTHONPATH" ":" prefix (,path
+  ;,(string-append pygtk "/lib/python2.7/site-packages/gtk-2.0")
+  )
+ %standard-phases
+(inputs
+ `(("python" ,python-2)
+   ("pygtk" ,python2-pygtk)
+   ("gettext" ,gnu-gettext)
+   ("ghostscript" ,ghostscript)
+   ("gtk" ,gtk+)
+   ;("lilypond" ,lilypond)
+   ))
+(native-inputs
+ `(("pkg-config" ,pkg-config)
+   ("txt2man" ,txt2man)
+   ("libxml2" ,libxml2) ; for tests
+   ("texinfo" ,texinfo)))
+(home-page "https://www.gnu.org/software/solfege/";)
+(synopsis "Ear training")
+(description
+ "GNU Solfege is a program for practicing musical ear-training.  With it,
+you can practice your recognition of

Re: [PATCH 1/5] gnu: Add efl.

[Ludovic Courtès]

Tomáš Čech  skribis:

> * gnu/packages/enlightenment.scm: New file
> * gnu/packages/enlightenment.scm (efl): New variable.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

[...]

> +(propagated-inputs
> + ; all these inputs are in package config files in section
> + ; Require.private

Please use two semicolons for comments like this one.  Capitalize
sentences and add a period at the end.

> +   (alist-cons-before
> +'configure 'patch-config-files
> +(lambda _
> +  (substitute* "po/Makefile.in.in"
> +(("/bin/sh") (which "bash"

I persist to think that this is not needed, is it?  If not, please
remove it.

> +(description
> + "Enlightenment Foundation Libraries is set of libraries developed
> +for Enlightenment, but is used for more applications because it is resource
> +friendly, energy efficient and good looking.  It consists of:
> +
> + * Eina - defining data types and low level abstractions
> + * Eo - generic object concept for EFL
> + * Eet - binary data parser and serializer
> + * Evas - canvas library
> + * Ecore - abstraction to operating system
> + * Embryo - script engine
> + * Escape - Playstation portability layer
> + * Evil - Microsoft Windows portability layer
> + * Eio - library for asynchronous input/output
> + * Eldbus - DBus integration
> + * Efreet - support for Freedesktop.org standards
> + * Eeze - hardware interface
> + * EPhysics - integration of physics engine
> + * Edje - UI layout library, themes support
> + * Emotion - multimedia integration
> + * Ethumb - image thumbnail support")

You’ll hate me for saying that ;-) but please make it just a plain
paragraph: the UIs may reformat the paragraph to their without caring
for the bullet list.

The text probably doesn’t need to be exhaustive, just to list some of
the main functionality.

> +(license (list license:bsd-2 license:lgpl2.1 license:zlib ; 
> different parts under different licenses

Line too long.

OK to push with these changes.

Thanks!

Ludo’.

Re: [PATCH] gnu: ecl: Update to version 15.2.21.

[Taylan Ulrich Bayırlı/Kammer]

taylanbayi...@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:

> Here's an updated patch for my proposal in my last e-mail.
> [...]

I went ahead and pushed a slightly edited version of that.

Taylan

Re: [PATCH 2/5] gnu: Add elementary.

[Ludovic Courtès]

Tomáš Čech  skribis:

> * gnu/packages/enlightenment.scm (elementary): New variable.

[...]

> +(native-inputs
> + `(("pkg-config" ,pkg-config)))
> +(inputs
> + `(("efl" ,efl)))

If Elementary headers include EFL headers, of if its .pc refers to
efl.pc, then EFL should be propagated.

OK to commit with this adjusted as needed!

Thanks,
Ludo’.

Re: [PATCH 3/5] gnu: Add evas-generic-loaders

[Ludovic Courtès]

Tomáš Čech  skribis:

> * gnu/packages/enlightenment.scm (evas-generic-loaders): New variable.

[...]

> +   ("efl" ,efl)

Propagate?

> +(description
> + "Evas-generic-loaders is collection of interfaces to outside libraries
> +and applications allowing to natively open pictures, documents and media
   ^
“allowing pictures to be opened”

OK to push with this change.

Ludo’.

Re: Python ignores pth files?

[Taylan Ulrich Bayırlı/Kammer]

Ricardo Wurmus  writes:

> pygtk and pygobject both come with .pth files that instruct Python to
> check out the "gtk-2.0" subdirectory, yet these files are seemingly
> ignored as (according to strace) Python makes no attempt to look inside
> the declared subdirectories when Solfege starts up.

I had the same experience trying to package nmap (still lying around in
a branch).  The #python IRC channel on Freenode told me that indeed .pth
files in PYTHONPATH aren't used, only those in some system paths.  I
can't remember the details, but Python's documentation should tell.

Taylan

Re: [PATCH 4/5] gnu: Add emotion-generic-players

[Ludovic Courtès]

Tomáš Čech  skribis:

> * gnu/packages/enlightenment.scm (emotion-generic-players): New variable.

[...]

> +(inputs
> + `(("efl" ,efl)

Propagate?

> + "Emotion-generic-players is collection of interfaces to outside 
> libraries
> +and applications allowing to natively play video files through Emotion.

“allowing videos to be played”

Other than that, OK.

Ludo’.

Re: [PATCH 5/5] gnu: Add terminology.

[Ludovic Courtès]

Tomáš Čech  skribis:

> * gnu/packages/enlightenment.scm (terminology): New variable.

[...]

> +(inputs
> + `(("efl" ,efl)
> +   ("elementary" ,elementary)))

Propagate?

> +(description
> + "Terminology is fast but advanced and feature rich terminal emulator.
> +Some of it's features:
> + - support for X and framebuffer (when properly built)
> + - multiple tabs
> + - UTF-8 support
> + - themable - you can change background, cursor, visual bell style,
> +   selection, etc.
> + - integrated popup viewer for images, videos, etc.
> + - tycat, tyls, typop tools for non-text contents
> + - history miniview
> + - URL and local path detection
> + - pop-up with gravatar on e-mail addresses")

No bullet list please.

OK to push with this change.

Thank you!

Ludo’.

Re: [ART] Updated SLiM theme with GuixSD logo

[Ludovic Courtès]

felipe.lo...@openmailbox.org skribis:

> Ah, sorry, I got distracted with the website design and never pushed
> the black version to the repository. I'll do this today.

Thanks!

> I'm fine with any of the versions, really. So I'll leave the decision
> to you :)

I guess I’ll switch to the black version.  :-)

Ludo’.

Re: Python ignores pth files?

[Ricardo Wurmus]

Taylan Ulrich Bayırlı/Kammer writes:

> Ricardo Wurmus  writes:
>
>> pygtk and pygobject both come with .pth files that instruct Python to
>> check out the "gtk-2.0" subdirectory, yet these files are seemingly
>> ignored as (according to strace) Python makes no attempt to look inside
>> the declared subdirectories when Solfege starts up.
>
> I had the same experience trying to package nmap (still lying around in
> a branch).  The #python IRC channel on Freenode told me that indeed .pth
> files in PYTHONPATH aren't used, only those in some system paths.  I
> can't remember the details, but Python's documentation should tell.

Apparently, it is possible to add the paths declared by pth files by
explicitly adding the parent site-packages directory as a site dir:

~~~
~/dev/guix $ export 
PYTHONPATH="/gnu/store/jk9aaqb563mxbydj5rbpmav37ia3pcf7-libxml2-2.9.0/lib/python2.7/site-packages:/gnu/store/l1ay93rj4v9dczm23s9qm1258qig5ywq-python-2.7.6/lib/python2.7/site-packages:/gnu/store/qb8jh3l0nmwc13gpjsp082w1iqxhqv9a-python2-pygtk-2.24.0/lib/python2.7/site-packages:/gnu/store/rkra74amwxbghv80xcxvnhm5jmhs5n3r-python2-pygobject-2.28.6/lib/python2.7/site-packages:/gnu/store/s23gjyn966zwsq9wvfc713d5c60jbb12-python2-py2cairo-1.10.0/lib/python2.7/site-packages"
~/dev/guix $ python
Python 2.7.6 (default, Feb 10 2015, 20:41:43) 
[GCC 4.8.4] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import sys
>>> print sys.path
['', 
'/gnu/store/jk9aaqb563mxbydj5rbpmav37ia3pcf7-libxml2-2.9.0/lib/python2.7/site-packages',
 
'/gnu/store/l1ay93rj4v9dczm23s9qm1258qig5ywq-python-2.7.6/lib/python2.7/site-packages',
 
'/gnu/store/qb8jh3l0nmwc13gpjsp082w1iqxhqv9a-python2-pygtk-2.24.0/lib/python2.7/site-packages',
 
'/gnu/store/rkra74amwxbghv80xcxvnhm5jmhs5n3r-python2-pygobject-2.28.6/lib/python2.7/site-packages',
 
'/gnu/store/s23gjyn966zwsq9wvfc713d5c60jbb12-python2-py2cairo-1.10.0/lib/python2.7/site-packages',
 '/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python27.zip', 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7', 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/plat-linux2',
 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/lib-tk',
 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/lib-old',
 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/lib-dynload',
 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/site-packages']
>>> import site
>>> site.addsitedir('/gnu/store/qb8jh3l0nmwc13gpjsp082w1iqxhqv9a-python2-pygtk-2.24.0/lib/python2.7/site-packages')
>>> print sys.path
['', 
'/gnu/store/jk9aaqb563mxbydj5rbpmav37ia3pcf7-libxml2-2.9.0/lib/python2.7/site-packages',
 
'/gnu/store/l1ay93rj4v9dczm23s9qm1258qig5ywq-python-2.7.6/lib/python2.7/site-packages',
 
'/gnu/store/qb8jh3l0nmwc13gpjsp082w1iqxhqv9a-python2-pygtk-2.24.0/lib/python2.7/site-packages',
 
'/gnu/store/rkra74amwxbghv80xcxvnhm5jmhs5n3r-python2-pygobject-2.28.6/lib/python2.7/site-packages',
 
'/gnu/store/s23gjyn966zwsq9wvfc713d5c60jbb12-python2-py2cairo-1.10.0/lib/python2.7/site-packages',
 '/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python27.zip', 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7', 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/plat-linux2',
 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/lib-tk',
 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/lib-old',
 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/lib-dynload',
 
'/gnu/store/c4lw432zk1makv5681jnzi6lnsphism8-python-2.7.6/lib/python2.7/site-packages',
 
'/gnu/store/qb8jh3l0nmwc13gpjsp082w1iqxhqv9a-python2-pygtk-2.24.0/lib/python2.7/site-packages/gtk-2.0']
~~~

Note that site.addsitedir added the subdirectory as declared by
"pygtk.pth".  I wonder if this means that I'll have to patch the
executable to run site.addsitedir over all elements in PYTHONPATH until
sys.path no longer changes.

~~ Ricardo

Moving ‘which’ to (gnu packages base)

[Ludovic Courtès]

Unless someone objects, I’ll move ‘which’ to (gnu packages base) Real Soon.

Ludo’.

Re: [ART] Updated SLiM theme with GuixSD logo

[felipe . lopez]

On 2015-03-01 15:37, l...@gnu.org wrote:

felipe.lo...@openmailbox.org skribis:


Ah, sorry, I got distracted with the website design and never pushed
the black version to the repository. I'll do this today.


Thanks!


I'm fine with any of the versions, really. So I'll leave the decision
to you :)


I guess I’ll switch to the black version.  :-)

Ludo’.


I pushed the black version and a sister version for GRUB.

Re: Python ignores pth files?

[Ricardo Wurmus]

Ricardo Wurmus writes:

> Taylan Ulrich Bayırlı/Kammer writes:
>
>> Ricardo Wurmus  writes:
>>
>>> pygtk and pygobject both come with .pth files that instruct Python to
>>> check out the "gtk-2.0" subdirectory, yet these files are seemingly
>>> ignored as (according to strace) Python makes no attempt to look inside
>>> the declared subdirectories when Solfege starts up.
>>
>> I had the same experience trying to package nmap (still lying around in
>> a branch).  The #python IRC channel on Freenode told me that indeed .pth
>> files in PYTHONPATH aren't used, only those in some system paths.  I
>> can't remember the details, but Python's documentation should tell.
>
> Apparently, it is possible to add the paths declared by pth files by
> explicitly adding the parent site-packages directory as a site dir:
>
[...]
>
> Note that site.addsitedir added the subdirectory as declared by
> "pygtk.pth".  I wonder if this means that I'll have to patch the
> executable to run site.addsitedir over all elements in PYTHONPATH until
> sys.path no longer changes.

I'm now patching the sources to add all site-packages directories, which
causes their pth files to be interpreted:

(substitute* "run-solfege.py"
  (("import os")
   "import os, site
for path in [path for path in sys.path if 'site-packages' in path]: 
site.addsitedir(path)"))

~~ Ricardo

[PATCH] Add zathura and friends.

[Paul van der Walt]

Hello Guix,

This patch adds zathura, the minimalistic pdf viewer, and plugins for
pdf, ps, djvu, cb (comic book, apparently). I've also packaged
DjVuLibre.

Zathura needed to be patched to accept an environment variable for
finding aforementioned plugins.

I hope this patch is reasonable -- it became a little monstrous.

Good $timeOfDay,
p.
>From c39f3443c96ce28127028264de431670ce9b3964 Mon Sep 17 00:00:00 2001
From: Paul van der Walt 
Date: Sun, 1 Mar 2015 23:47:42 +0100
Subject: [PATCH] gnu: Add zathura, zathura-djvu, zathura-ps,
 zathura-pdf-poppler, djvulibre.

* gnu-system.am: Add zathura-plugindir-environment-variable.patch.
* gnu/packages/patches/zathura-plugindir-environment-variable.patch: Patch
  zathura to respect ZATHURA_PLUGIN_DIR environment variable.
* gnu/packages/pdf.scm (djvulibre): New variable.
* gnu/packages/pdf.scm (zathura): New variable.
* gnu/packages/pdf.scm (zathura-pdf-poppler): New variable.
* gnu/packages/pdf.scm (zathura-ps): New variable.
* gnu/packages/pdf.scm (zathura-cb): New variable.
* gnu/packages/pdf.scm (zathura-djvu): New variable.
---
 gnu-system.am  |   4 +-
 .../zathura-plugindir-environment-variable.patch   |  44 
 gnu/packages/pdf.scm   | 267 +
 3 files changed, 313 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/zathura-plugindir-environment-variable.patch

diff --git a/gnu-system.am b/gnu-system.am
index e42e89a..5dda73a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -550,8 +550,8 @@ dist_patch_DATA =		\
   gnu/packages/patches/xf86-video-trident-remove-mibstore.patch	\
   gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch	\
   gnu/packages/patches/xfce4-panel-plugins.patch		\
-  gnu/packages/patches/xmodmap-asprintf.patch
-
+  gnu/packages/patches/xmodmap-asprintf.patch   \
+  gnu/packages/patches/zathura-plugindir-environment-variable.patch
 MISC_DISTRO_FILES = gnu/packages/javac.in
 
 bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
diff --git a/gnu/packages/patches/zathura-plugindir-environment-variable.patch b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
new file mode 100644
index 000..4c7d116
--- /dev/null
+++ b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
@@ -0,0 +1,44 @@
+From f41ea6573185ec326870004e579354e5dd829672 Mon Sep 17 00:00:00 2001
+From: Paul van der Walt 
+Date: Sun, 1 Mar 2015 22:57:43 +0100
+Subject: [PATCH] Search for Zathura plugins (for reading different file
+ formats) in the environment variable ZATHURA_PLUGIN_DIR. Command line option
+ -p still takes precedence.
+
+Patch by Paul van der Walt .
+---
+ zathura/zathura.c | 12 
+ 1 file changed, 12 insertions(+)
+
+diff --git a/zathura/zathura.c b/zathura/zathura.c
+index 589dd28..d3c9887 100644
+--- a/zathura/zathura.c
 b/zathura/zathura.c
+@@ -413,12 +413,24 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* dir)
+   g_return_if_fail(zathura != NULL);
+   g_return_if_fail(zathura->plugins.manager != NULL);
+ 
++  // Get the new environment variable, if any.
++  const gchar* envvar_plugin_dir = g_getenv("ZATHURA_PLUGIN_DIR");
++
+   if (dir != NULL) {
++// This bit sets the plugin dir from command-line.
+ girara_list_t* paths = girara_split_path_array(dir);
+ GIRARA_LIST_FOREACH(paths, char*, iter, path)
+ zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
+ GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
+ girara_list_free(paths);
++  } else if (envvar_plugin_dir != NULL) {
++// Set plugins dir to the contents of environment variable
++// ZATHURA_PLUGIN_DIR.
++girara_list_t* paths = girara_split_path_array(envvar_plugin_dir);
++GIRARA_LIST_FOREACH(paths, char*, iter, path)
++zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
++GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
++girara_list_free(paths);
+   } else {
+ #ifdef ZATHURA_PLUGINDIR
+ girara_list_t* paths = girara_split_path_array(ZATHURA_PLUGINDIR);
+-- 
+2.3.1
+
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7b4f2ab..b76b006 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013, 2015 Andreas Enge 
 ;;; Copyright © 2014 Mark H Weaver 
 ;;; Copyright © 2014, 2015 Ricardo Wurmus 
+;;; Copyright © 2015 Paul van der Walt 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,6 +29,9 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages lesstif)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
@@ -143,6 +147,269 @@
(license license:gpl3) ; or gpl2, but not gpl2+
(home-page "http://www.foolabs.com/xpdf/";)))
 
+
+(def

Re: [PATCH] Add zathura and friends.

[David Thompson]

Paul van der Walt  writes:

> From c39f3443c96ce28127028264de431670ce9b3964 Mon Sep 17 00:00:00 2001
> From: Paul van der Walt 
> Date: Sun, 1 Mar 2015 23:47:42 +0100
> Subject: [PATCH] gnu: Add zathura, zathura-djvu, zathura-ps,
>  zathura-pdf-poppler, djvulibre.
>
> * gnu-system.am: Add zathura-plugindir-environment-variable.patch.
> * gnu/packages/patches/zathura-plugindir-environment-variable.patch: Patch
>   zathura to respect ZATHURA_PLUGIN_DIR environment variable.
> * gnu/packages/pdf.scm (djvulibre): New variable.
> * gnu/packages/pdf.scm (zathura): New variable.
> * gnu/packages/pdf.scm (zathura-pdf-poppler): New variable.
> * gnu/packages/pdf.scm (zathura-ps): New variable.
> * gnu/packages/pdf.scm (zathura-cb): New variable.
> * gnu/packages/pdf.scm (zathura-djvu): New variable.

Could you break this into one commit per package?  Thanks!

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

[PATCH 6/7] gnu: Add zathura postscript plugin.

[Paul van der Walt]

* gnu/packages/pdf.scm (zathura-ps): New variable.
---
 gnu/packages/pdf.scm | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 9e4dff8..d931721 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -150,6 +150,45 @@
 
 
 
+(define-public zathura-ps
+  (package
+(name "zathura-ps")
+(version "0.2.2")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append 
"https://pwmt.org/projects/zathura-ps/download/zathura-ps-";
+  version ".tar.gz"))
+  (sha256
+   (base32
+"1a6ps5v1wk18qvslbkjln6w8wfzzr6fi13ls96vbdc03vdhn4m76"
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(build-system gnu-build-system)
+(arguments
+ `(#:make-flags
+   `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+  "PLUGINDIR=/lib/zathura" "CC=gcc")
+   #:phases
+   (alist-delete
+'check
+(alist-delete
+ 'configure
+ %standard-phases
+(home-page "https://pwmt.org/projects/zathura-ps/";)
+(synopsis "PS support for zathura (libspectre backend)")
+(description "The zathura-ps plugin adds PS support to zathura
+using libspectre.")
+(propagated-inputs
+ `(("girara" ,girara)))
+(inputs
+ `(("libspectre" ,libspectre)
+   ("gtk+" ,gtk+)
+   ("zathura" ,(package (inherit zathura)
+(inputs (alist-delete "zathura-ps"
+  (package-inputs 
zathura)))
+(license license:zlib)))
+
 (define-public zathura-djvu
   (package
 (name "zathura-djvu")
-- 
2.3.1

[PATCH 4/7] gnu: Add zathura PDF plugin.

[Paul van der Walt]

* gnu/packages/pdf.scm (zathura-pdf-poppler): New variable.
---
 gnu/packages/pdf.scm | 41 +
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 834ba6d..f77a2e5 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -150,6 +150,47 @@
 
 
 
+
+(define-public zathura-pdf-poppler
+  (package
+(name "zathura-pdf-poppler")
+(version "0.2.5")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append 
"https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-";
+  version ".tar.gz"))
+  (sha256
+   (base32
+"1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0"
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(build-system gnu-build-system)
+(arguments
+ `(#:make-flags
+   `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+  "PLUGINDIR=/lib/zathura" "CC=gcc")
+   #:phases
+   (alist-delete
+'check
+(alist-delete
+ 'configure
+ %standard-phases
+(home-page "https://pwmt.org/projects/zathura-pdf-poppler/";)
+(synopsis "PDF support for zathura (poppler backend)")
+(description "The zathura-pdf-poppler plugin adds PDF support to zathura
+by using the poppler rendering engine.")
+(propagated-inputs
+ `(("girara" ,girara)))
+(inputs
+ `(("poppler" ,poppler)
+   ("gtk+" ,gtk+)
+   ("zathura" ,(package (inherit zathura)
+(inputs (alist-delete "zathura-pdf-poppler"
+  (package-inputs zathura)
+   ("cairo" ,cairo)))
+(license license:zlib)))
+
 (define-public zathura
   (package
 (name "zathura")
-- 
2.3.1

[PATCH 2/7] gnu: Add djvulibre.

[Paul van der Walt]

* gnu/packages/pdf.scm (djvulibre): New variable.
---
 gnu/packages/pdf.scm | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7b4f2ab..76c77d9 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013, 2015 Andreas Enge 
 ;;; Copyright © 2014 Mark H Weaver 
 ;;; Copyright © 2014, 2015 Ricardo Wurmus 
+;;; Copyright © 2015 Paul van der Walt 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -143,6 +144,27 @@
(license license:gpl3) ; or gpl2, but not gpl2+
(home-page "http://www.foolabs.com/xpdf/";)))
 
+
+
+(define-public djvulibre
+  (package
+(name "djvulibre")
+(version "3.5.27")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "mirror://sourceforge/djvulibre/djvulibre-"
+  version ".tar.gz"))
+  (sha256
+   (base32
+"0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"
+(build-system gnu-build-system)
+(home-page "http://djvu.sourceforge.net/";)
+(synopsis "DjVuLibre is a GPL implementation of DjVu, a document format.")
+(description "DjVuLibre is an open source (GPL'ed) implementation of DjVu,
+including viewers, browser plugins, decoders, simple encoders, and
+utilities.")
+(license license:gpl2)))
+
 (define-public podofo
   (package
 (name "podofo")
-- 
2.3.1

[PATCH 1/7] gnu: Add girara.

[Paul van der Walt]

* gnu/packages/gtk.scm (girara): Add variable.
---
 gnu/packages/gtk.scm | 44 
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 81f912e..2b62b99 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver 
 ;;; Copyright © 2014 Eric Bavier 
 ;;; Copyright © 2015 Federico Beffa 
+;;; Copyright © 2015 Paul van der Walt 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,6 +29,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system waf)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages ghostscript)
@@ -770,3 +772,45 @@ extensive documentation, including API reference and a 
tutorial.")
 targetted at GTK 2.x, and can be used in conjunction with gnome-python to
 write GNOME applications.")
 (license license:lgpl2.1+)))
+
+(define-public girara
+  (package
+(name "girara")
+(version "0.2.3")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append 
"https://pwmt.org/projects/girara/download/girara-";
+  version ".tar.gz"))
+  (sha256
+   (base32
+"1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh"
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(arguments
+ `(#:make-flags
+   `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
+ "COLOR=0" "CC=gcc")
+   #:test-target "test"
+   #:phases
+   (alist-delete
+'check
+(alist-delete
+ 'configure
+ %standard-phases
+(inputs `(("gtk+" ,gtk+)
+  ("glib" ,glib)
+  ("gettext" ,gnu-gettext)))
+(build-system gnu-build-system)
+(home-page "https://pwmt.org/projects/girara/";)
+(synopsis "library for minimalistic gtk+3 user interfaces")
+(description "girara is a library that implements a user interface that
+focuses on simplicity and minimalism. Currently based on GTK+, a
+cross-platform widget toolkit, it provides an interface that focuses on three
+main components: A so-called view widget that represents the actual
+application, an input bar that is used to execute commands of the
+application and the status bar which provides the user with current
+information. girara was designed to replace and enhance the user interface
+that is used by zathura and jumanji and other features that those applications
+share.")
+(license license:zlib)))
-- 
2.3.1

[PATCH 7/7] gnu: Add zathura comicbook plugin.

[Paul van der Walt]

* gnu/packages/pdf.scm (zathura-cb): New variable.
---
 gnu/packages/pdf.scm | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index d931721..e876e4a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -149,6 +149,45 @@
 
 
 
+(define-public zathura-cb
+  (package
+(name "zathura-cb")
+(version "0.1.4")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append 
"https://pwmt.org/projects/zathura-cb/download/zathura-cb-";
+  version ".tar.gz"))
+  (sha256
+   (base32
+"09ln4fpjxmhcq6cw1ka7mdkmca36gyd4gzrynbw3waz0ri0b277j"
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(build-system gnu-build-system)
+(arguments
+ `(#:make-flags
+   `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+  "PLUGINDIR=/lib/zathura" "CC=gcc")
+   #:phases
+   (alist-delete
+'check
+(alist-delete
+ 'configure
+ %standard-phases
+(home-page "https://pwmt.org/projects/zathura-cb/";)
+(synopsis "Comic book support for zathura (libarchive backend)")
+(description "The zathura-cb plugin adds comic book support to zathura
+using libarchive.")
+(propagated-inputs
+ `(("girara" ,girara)))
+(inputs
+ `(("libarchive" ,libarchive)
+   ("gtk+" ,gtk+)
+   ("zathura" ,(package (inherit zathura)
+(inputs (alist-delete "zathura-cb"
+  (package-inputs 
zathura)))
+(license license:zlib)))
+
 
 (define-public zathura-ps
   (package
-- 
2.3.1

[PATCH 5/7] gnu: Add zathura DjVu plugin.

[Paul van der Walt]

* gnu/packages/pdf.scm (zathura-djvu): New variable.
---
 gnu/packages/pdf.scm | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index f77a2e5..9e4dff8 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -150,6 +150,45 @@
 
 
 
+(define-public zathura-djvu
+  (package
+(name "zathura-djvu")
+(version "0.2.4")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append 
"https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-";
+  version ".tar.gz"))
+  (sha256
+   (base32
+"1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c"
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(build-system gnu-build-system)
+(arguments
+ `(#:make-flags
+   `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+  "PLUGINDIR=/lib/zathura" "CC=gcc")
+   #:phases
+   (alist-delete
+'check
+(alist-delete
+ 'configure
+ %standard-phases
+(home-page "https://pwmt.org/projects/zathura-djvu/";)
+(synopsis "DjVu support for zathura (DjVuLibre backend)")
+(description "The zathura-djvu plugin adds DjVu support to zathura
+using the DjVuLibre library.")
+(propagated-inputs
+ `(("girara" ,girara)))
+(inputs
+ `(("djvulibre" ,djvulibre)
+   ("gtk+" ,gtk+)
+   ("zathura" ,(package (inherit zathura)
+(inputs (alist-delete "zathura-djvu"
+  (package-inputs 
zathura)))
+(license license:zlib)))
+
 
 (define-public zathura-pdf-poppler
   (package
-- 
2.3.1

[PATCH 3/7] gnu: Add zathura.

[Paul van der Walt]

* gnu/packages/pdf.scm (zathura): New variable.
* gnu-system.am: Add zathura-plugindir-environment-variable.patch
* gnu/packages/patches/zathura-plugindir-environment-variable.patch: Add patch
  for zathura environment variable.
---
 gnu-system.am  |  4 +-
 .../zathura-plugindir-environment-variable.patch   | 44 +++
 gnu/packages/pdf.scm   | 50 ++
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 
gnu/packages/patches/zathura-plugindir-environment-variable.patch

diff --git a/gnu-system.am b/gnu-system.am
index e42e89a..5dda73a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -550,8 +550,8 @@ dist_patch_DATA =   
\
   gnu/packages/patches/xf86-video-trident-remove-mibstore.patch\
   gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch  \
   gnu/packages/patches/xfce4-panel-plugins.patch   \
-  gnu/packages/patches/xmodmap-asprintf.patch
-
+  gnu/packages/patches/xmodmap-asprintf.patch   \
+  gnu/packages/patches/zathura-plugindir-environment-variable.patch
 MISC_DISTRO_FILES = gnu/packages/javac.in
 
 bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
diff --git a/gnu/packages/patches/zathura-plugindir-environment-variable.patch 
b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
new file mode 100644
index 000..4c7d116
--- /dev/null
+++ b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
@@ -0,0 +1,44 @@
+From f41ea6573185ec326870004e579354e5dd829672 Mon Sep 17 00:00:00 2001
+From: Paul van der Walt 
+Date: Sun, 1 Mar 2015 22:57:43 +0100
+Subject: [PATCH] Search for Zathura plugins (for reading different file
+ formats) in the environment variable ZATHURA_PLUGIN_DIR. Command line option
+ -p still takes precedence.
+
+Patch by Paul van der Walt .
+---
+ zathura/zathura.c | 12 
+ 1 file changed, 12 insertions(+)
+
+diff --git a/zathura/zathura.c b/zathura/zathura.c
+index 589dd28..d3c9887 100644
+--- a/zathura/zathura.c
 b/zathura/zathura.c
+@@ -413,12 +413,24 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* 
dir)
+   g_return_if_fail(zathura != NULL);
+   g_return_if_fail(zathura->plugins.manager != NULL);
+ 
++  // Get the new environment variable, if any.
++  const gchar* envvar_plugin_dir = g_getenv("ZATHURA_PLUGIN_DIR");
++
+   if (dir != NULL) {
++// This bit sets the plugin dir from command-line.
+ girara_list_t* paths = girara_split_path_array(dir);
+ GIRARA_LIST_FOREACH(paths, char*, iter, path)
+ zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
+ GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
+ girara_list_free(paths);
++  } else if (envvar_plugin_dir != NULL) {
++// Set plugins dir to the contents of environment variable
++// ZATHURA_PLUGIN_DIR.
++girara_list_t* paths = girara_split_path_array(envvar_plugin_dir);
++GIRARA_LIST_FOREACH(paths, char*, iter, path)
++zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
++GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
++girara_list_free(paths);
+   } else {
+ #ifdef ZATHURA_PLUGINDIR
+ girara_list_t* paths = girara_split_path_array(ZATHURA_PLUGINDIR);
+-- 
+2.3.1
+
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 76c77d9..834ba6d 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -29,6 +29,9 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages lesstif)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
@@ -146,6 +149,53 @@
 
 
 
+
+(define-public zathura
+  (package
+(name "zathura")
+(version "0.3.2")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append 
"https://pwmt.org/projects/zathura/download/zathura-";
+  version ".tar.gz"))
+  (sha256
+   (base32
+"1qk5s7cyqp4l673yhma5igk9g24p5jyqyy81fdk7q7xjqlym19px"))
+  (patches
+   (list
+(search-patch 
"zathura-plugindir-environment-variable.patch")
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(native-search-paths
+ (list (search-path-specification
+(variable "ZATHURA_PLUGIN_DIR")
+(files '("lib/zathura")
+(build-system gnu-build-system)
+(arguments
+ `(#:make-flags
+   `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
+ "CC=gcc" "COLOR=0")
+   #:phases
+   (alist-delete
+'check
+(alist-delete
+ 'configure
+ %standard-phases
+(home-page "https://pwmt.org/projects/zathura/";)
+(s

Re: 01/01: services: xorg: Fix file descriptor leak from SLiM/xinitrc.

[Mark H Weaver]

Ludovic Courtès  writes:

> commit ec4a4c46efaf2e7373f331654640f1321c0f2e62
> Author: Ludovic Courtès 
> Date:   Sat Feb 28 22:44:31 2015 +0100
>
> services: xorg: Fix file descriptor leak from SLiM/xinitrc.
> 
> Previously processes started from the window manager would have a couple
> of leaked file descriptors: writable /var/log/slim.log and readable
> /gnu/store/…-xinitrc.
> 
> * gnu/services/xorg.scm (xinitrc)[builder]: Add 'close-all-fdes'.  Use
>   it in 'exec-from-login-shell'.

This commit broke XFCE, so I've reverted it until we can investigate
further.

   Mark

Re: [PATCH 2/7] gnu: Add djvulibre.

[宋文武]

2015-03-02 7:47 GMT+08:00 Paul van der Walt :
> * gnu/packages/pdf.scm (djvulibre): New variable.
> ---
>  gnu/packages/pdf.scm | 22 ++
>  1 file changed, 22 insertions(+)
>
> diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
> index 7b4f2ab..76c77d9 100644
> --- a/gnu/packages/pdf.scm
> +++ b/gnu/packages/pdf.scm
> @@ -2,6 +2,7 @@
>  ;;; Copyright © 2013, 2015 Andreas Enge 
>  ;;; Copyright © 2014 Mark H Weaver 
>  ;;; Copyright © 2014, 2015 Ricardo Wurmus 
> +;;; Copyright © 2015 Paul van der Walt 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -143,6 +144,27 @@
> (license license:gpl3) ; or gpl2, but not gpl2+
> (home-page "http://www.foolabs.com/xpdf/";)))
>
> +
> +
> +(define-public djvulibre
> +  (package
> +(name "djvulibre")
> +(version "3.5.27")
> +(source (origin
> +  (method url-fetch)
> +  (uri (string-append "mirror://sourceforge/djvulibre/djvulibre-"
> +  version ".tar.gz"))
> +  (sha256
> +   (base32
> +"0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"
> +(build-system gnu-build-system)
> +(home-page "http://djvu.sourceforge.net/";)
> +(synopsis "DjVuLibre is a GPL implementation of DjVu, a document 
> format.")
Synposis is too long, and shouldn't contain package name, end with peroid, etc.
Perhaps just "Implementation of DjVu"?
> +(description "DjVuLibre is an open source (GPL'ed) implementation of 
> DjVu,
> +including viewers, browser plugins, decoders, simple encoders, and
> +utilities.")
We don't use words like "open source", and no need to mention GPL here.
> +(license license:gpl2)))
Should be 'license:gpl2'+.
> +
>  (define-public podofo
>(package
>  (name "podofo")
> --
> 2.3.1
>
>
Otherwise, look good to me.

Re: [PATCH 2/7] gnu: Add djvulibre.

[Mark H Weaver]

宋文武  writes:

> 2015-03-02 7:47 GMT+08:00 Paul van der Walt :
>> * gnu/packages/pdf.scm (djvulibre): New variable.
>> ---
>>  gnu/packages/pdf.scm | 22 ++
>>  1 file changed, 22 insertions(+)
>>
>> diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
>> index 7b4f2ab..76c77d9 100644
>> --- a/gnu/packages/pdf.scm
>> +++ b/gnu/packages/pdf.scm
>> @@ -2,6 +2,7 @@
>>  ;;; Copyright © 2013, 2015 Andreas Enge 
>>  ;;; Copyright © 2014 Mark H Weaver 
>>  ;;; Copyright © 2014, 2015 Ricardo Wurmus 
>> +;;; Copyright © 2015 Paul van der Walt 
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -143,6 +144,27 @@
>> (license license:gpl3) ; or gpl2, but not gpl2+
>> (home-page "http://www.foolabs.com/xpdf/";)))
>>
>> +
>> +

Just one blank line between package definitions.

>> +(define-public djvulibre
>> +  (package
>> +(name "djvulibre")
>> +(version "3.5.27")
>> +(source (origin
>> +  (method url-fetch)
>> +  (uri (string-append 
>> "mirror://sourceforge/djvulibre/djvulibre-"
>> +  version ".tar.gz"))
>> +  (sha256
>> +   (base32
>> +"0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"
>> +(build-system gnu-build-system)
>> +(home-page "http://djvu.sourceforge.net/";)
>> +(synopsis "DjVuLibre is a GPL implementation of DjVu, a document 
>> format.")
> Synposis is too long, and shouldn't contain package name, end with peroid, 
> etc.
> Perhaps just "Implementation of DjVu"?

I would suggest "Implementation of the DjVu document format" for the
sake of those who aren't familiar with DjVu.

Otherwise I agree with 宋文武's suggestions.

Can you send an updated patch?

 Thanks!
   Mark

Re: [PATCH 1/7] gnu: Add girara.

[宋文武]

2015-03-02 7:47 GMT+08:00 Paul van der Walt :
> * gnu/packages/gtk.scm (girara): Add variable.
> ---
>  gnu/packages/gtk.scm | 44 
>  1 file changed, 44 insertions(+)
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index 81f912e..2b62b99 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -4,6 +4,7 @@
>  ;;; Copyright © 2014, 2015 Mark H Weaver 
>  ;;; Copyright © 2014 Eric Bavier 
>  ;;; Copyright © 2015 Federico Beffa 
> +;;; Copyright © 2015 Paul van der Walt 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -28,6 +29,7 @@
>#:use-module (guix build-system gnu)
>#:use-module (guix build-system python)
>#:use-module (guix build-system waf)
> +  #:use-module (gnu packages gettext)
>#:use-module (gnu packages compression)
>#:use-module (gnu packages fontutils)
>#:use-module (gnu packages ghostscript)
> @@ -770,3 +772,45 @@ extensive documentation, including API reference and a 
> tutorial.")
>  targetted at GTK 2.x, and can be used in conjunction with gnome-python to
>  write GNOME applications.")
>  (license license:lgpl2.1+)))
> +
> +(define-public girara
> +  (package
> +(name "girara")
> +(version "0.2.3")
> +(source (origin
> +  (method url-fetch)
> +  (uri
> +   (string-append 
> "https://pwmt.org/projects/girara/download/girara-";
> +  version ".tar.gz"))
> +  (sha256
> +   (base32
> +"1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh"
> +(native-inputs
> + `(("pkg-config" ,pkg-config)))
> +(arguments
> + `(#:make-flags
> +   `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
> + "COLOR=0" "CC=gcc")
> +   #:test-target "test"
> +   #:phases
> +   (alist-delete
> +'check
I think pass '#:tests? #f' with a comment instead of delete
the check phase is more clear.
> +(alist-delete
> + 'configure
> + %standard-phases
> +(inputs `(("gtk+" ,gtk+)
> +  ("glib" ,glib)
> +  ("gettext" ,gnu-gettext)))
If gettext only used at build time (most case), it shoud be a 'native-inputs'.
And gtk+ should be a 'propagate-inputs', because it's in the girara.pc,
and referred by header files.
And I think glib is not needed here, it should just be propagated by gtk+,
if not then it's a bug ;-)
> +(build-system gnu-build-system)
> +(home-page "https://pwmt.org/projects/girara/";)
> +(synopsis "library for minimalistic gtk+3 user interfaces")
> +(description "girara is a library that implements a user interface that
> +focuses on simplicity and minimalism. Currently based on GTK+, a
> +cross-platform widget toolkit, it provides an interface that focuses on three
> +main components: A so-called view widget that represents the actual
> +application, an input bar that is used to execute commands of the
> +application and the status bar which provides the user with current
> +information. girara was designed to replace and enhance the user interface
> +that is used by zathura and jumanji and other features that those 
> applications
> +share.")
Both should start with a uppercase, and we use period followed by two spaces
as sentences separator.
You can  use './pre-inst-env guix lint girara'  to get more tips.
> +(license license:zlib)))
> --
> 2.3.1
>
>

Re: [PATCH 03/15] gnu: xfconf: Update to 4.12.0.

[Mark H Weaver]

宋文武  writes:

> * gnu/packages/xfce.scm (xfconf): Update to 4.12.0.
>   [arguments]: Add #:phases.  Remove #:parallel-tests? argument.

I'm sorry, but I pushed my own urgent update of 'xfconf' before noticing
that you had already proposed this commit, which is better than mine
because it preserves the test suite.

The problem is that you pushed the other updates before pushing this
one, which resulted in almost all of the xfce builds failing.  I then
felt compelled to quickly fix things up.

Would you like to change the 'xfconf' package to match what you have
below?  Also, please remember to add "2015" to your copyright line at
the top of xfce.scm.

Thanks!
  Mark

> ---
>  gnu/packages/xfce.scm | 17 ++---
>  1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 3679eb0..0e45ee4 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -89,7 +89,7 @@ Xfce Desktop Environment.")
>  (define-public xfconf
>(package
>  (name "xfconf")
> -(version "4.10.0")
> +(version "4.12.0")
>  (source (origin
>(method url-fetch)
>(uri (string-append "http://archive.xfce.org/xfce/";
> @@ -97,9 +97,20 @@ Xfce Desktop Environment.")
>"/src/" name "-" version ".tar.bz2"))
>(sha256
> (base32
> -"0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"
> +"0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"
>  (build-system gnu-build-system)
> -(arguments '(#:parallel-tests? #f)) ; parallel tests failed
> +(arguments
> + '(#:phases
> +   ;; Swap check and install phases.
> +   (alist-cons-after
> +'install 'check
> +(lambda _
> +  (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable 
> HOME
> +  ;; Run test-suite under a dbus session.
> +  (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
> +  (string-append %output "/share"))
> +  (zero? (system* "dbus-launch" "make" "check")))
> +(alist-delete 'check %standard-phases
>  (native-inputs
>   `(("pkg-config" ,pkg-config)
> ("intltool" ,intltool)))

Re: [PATCH 01/15] gnu: gtk-xfce-engine: Update to 2.10.0.

[Mark H Weaver]

Andreas Enge  writes:

> On Sun, Mar 01, 2015 at 01:57:12PM +0800, 宋文武 wrote:
>> -(version "3.0.0")
>> +(version "2.10.0")
>
> Something is suspicious here - a downgrade?

Yes, it's strange, but compare the versions of gtk-xfce-engine available
at these two URLs:

  http://archive.xfce.org/xfce/4.10/src/
  http://archive.xfce.org/xfce/4.12/src/

Also see:

  https://mail.xfce.org/pipermail/xfce-announce/2015-February/000368.html

"For Xfce 4.12 the gtk-xfce-engine will be gtk2 only."

I think 宋文武 should push this commit.

 Thanks!
   Mark

Re: [PATCH 2/2] gnu: Add AlsaModularSynth.

[Mark H Weaver]

Ricardo Wurmus  writes:

> From dbf194fdfd5baf9b79ebc7ba3c60835421cce12a Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus 
> Date: Sun, 1 Mar 2015 13:35:06 +0100
> Subject: [PATCH 1/2] gnu: Add clalsadrv.
>
> * gnu/packages/audio.scm (clalsadrv): New variable.
> ---
>  gnu/packages/audio.scm | 43 +++
>  1 file changed, 43 insertions(+)
>
> diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
> index ac6bc25..b7e74ca 100644
> --- a/gnu/packages/audio.scm
> +++ b/gnu/packages/audio.scm
> @@ -199,6 +199,49 @@ bass section with five drawbars.  A standalone JACK 
> application and LV2
>  plugins are provided.")
>  (license license:gpl2)))
>  
> +(define-public clalsadrv
> +  (package
> +(name "clalsadrv")
> +(version "2.0.0")
> +(source (origin
> +  (method url-fetch)
> +  (uri (string-append
> +"http://kokkinizita.linuxaudio.org";
> +"/linuxaudio/downloads/clalsadrv-"
> +version ".tar.bz2"))
> +  (sha256
> +   (base32
> +"0bsacx3l9065gk8g4137qmz2ij7s9x06aldvacinzlcslw7bd1kq"))
> +  (modules '((guix build utils)))
> +  (snippet
> +   '(substitute* "libs/Makefile"
> +  (("/sbin/ldconfig") "true")
> +(build-system gnu-build-system)
> +(arguments
> + `(#:tests? #f ; no "check" target
> +   #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs 
> "out")))
> +   #:phases
> +   (alist-cons-after
> +'unpack
> +'enter-directory
> +(lambda _ (chdir "libs"))
> +(alist-cons-after
> + 'install
> + 'install-symlink
> + (lambda _
> +   (symlink "libclalsadrv.so"
> +(string-append (assoc-ref %outputs "out")
> +   "/lib/libclalsadrv.so.2")))

On Hydra, this 'symlink' call is failing on both x86_64 and mips64el.
See:

  http://hydra.gnu.org/build/263381/log/tail-reload
  http://hydra.gnu.org/build/263382/log/tail-reload

Can you look into it?

  Mark

Re: [PATCH 0/2] Improve search path handling?

[Mark H Weaver]

Andreas Enge  writes:

> On Sat, Feb 28, 2015 at 12:31:59PM -0500, David Thompson wrote:
>> Yes, I think so.  I think I have resolved this, but it's a "rebuild the
>> world" change so I don't yet know if it works.  Would it be possible to
>> add a 'wip-search-paths' branch for Hydra to build?
>
> Definitely! If you create and push such a branch, we can make it build on
> hydra. But maybe now is the moment to push lots of stuff to core-updates
> anyway (except that there have been so many changes recently, that I worry
> if anything breaks, it will be difficult to determine why).

I think we should just push this to 'core-updates' ASAP.

  Mark

Re: [PATCH 3/3] gnu: Add ghc.

[Mark H Weaver]

Federico Beffa  writes:

> Attached a new patch that hopefully addresses the concerns expressed
> in this thread:
> https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00814.html
>
> I do not create a ready to use bootstrap package because the resulting
> store entry amounts to 940MB! I just keep an unmodified fixed version
> tarball (68MB)

Eventually we should learn how to build our own bootstrap GHC that's as
lean as theirs, but we can do that later.

> From c39f2fa29bd614227f501cb83f72e2aa827a9123 Mon Sep 17 00:00:00 2001
> From: Federico Beffa 
> Date: Wed, 25 Feb 2015 20:20:24 +0100
> Subject: [PATCH] gnu: Add ghc.
>
> * gnu/packages/haskell.scm: New file.

This new file needs to be added to gnu-system.am.

> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> new file mode 100644
> index 000..b0630a9
> --- /dev/null
> +++ b/gnu/packages/haskell.scm
[...]
> +;; We use bootstrap bianries with a fix version which can be used to build

s/bianries/binaries/

> +(description
> + "The Glasgow Haskell Compiler (GHC) is a state-of-the-art, open source,
> +compiler and interactive environment for the functional language Haskell.")

We should remove the term "open source".  Everything in GuixSD is free
software anyway, so we needn't mention that in our package descriptions.

 Thanks,
   Mark