Re: [PATCH] gnu: Add font-adobe-source-han-sans.

[Andreas Enge]

On Sat, Feb 28, 2015 at 11:23:59AM +0800, 宋文武 wrote:
> Updated patch:

Looks good from reading it (I did not try to compile), so please push!

Andreas

Re: 01/02: utils: Change 'patch-shebangs' to use binary input.

[Andreas Enge]

By the way, the latest modifications broke core-updates:
   http://hydra.gnu.org/build/262811/nixlog/2/tail-reload
ends with
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)'.

This looks related...

Andreas

Re: 01/02: utils: Change 'patch-shebangs' to use binary input.

[Andreas Enge]

For the record, I tried to work on top of
commit f1886b51bd86bd80a47c5b4aafc16039126315e8
gnu: cmake: Update to 3.1.3.
of core-updates. There I get a test failure

Testsuite summary for gettext-tools 0.19.4

# TOTAL: 397
# PASS:  357
# SKIP:  38
# XFAIL: 0
# FAIL:  2
# XPASS: 0
# ERROR: 0

Just in case we need to trace back problems.

Andreas

Re: 01/02: utils: Change 'patch-shebangs' to use binary input.

[Andreas Enge]

In fact, this one has been fixed in e8c9f0498f9f3ead4ea345d49f1c5e630ff158f8.
So please disregard my message.

Andreas

[PATCH] ncmpcpp version update, mail.scm copyright line

[Paul van der Walt]

Hello again,

Included are 2 patches: one to update the copyright line in mail.scm,
since i forgot that when bumping the mu version, and another to upgrade
ncmpcpp, the MPD client, to latest stable.

Another question for you all: i would like to package MPC, the MPD cli
client, but mpc is already the name of the GNU multiprecision
library. What should i call this mpc package? Since i know that Guixers
are prone to long debates about names (i jest :p), here's my single
suggestion:

* mpc-client

Bye!
p.

>From 0963038a01ff1b3c1646d58a2eae0f92180cb8f7 Mon Sep 17 00:00:00 2001
From: Paul van der Walt 
Date: Sat, 28 Feb 2015 14:28:00 +0100
Subject: [PATCH 1/2] gnu: mail: Add copyright line.

* gnu/packages/mail.scm (mu): Add forgotten copyright line.
---
 gnu/packages/mail.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ca25c58..a3ea778 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2014 Sou Bunnbu 
 ;;; Copyright © 2014 Julien Lepiller 
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer 
+;;; Copyright © 2015 Paul van der Walt 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.3.1

>From 7666c884f2a06a4389e4889ab50429c4b1119422 Mon Sep 17 00:00:00 2001
From: Paul van der Walt 
Date: Sat, 28 Feb 2015 14:49:09 +0100
Subject: [PATCH 2/2] gnu: ncmpcpp: Update to v0.6.2

* gnu/packages/mpd.scm (ncmpcpp): Update to version 0.6.2. Added Boost,
  readline, autotools. Added copyright line.
---
 gnu/packages/mpd.scm | 26 +++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index a1b4272..550e75d 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014 Andreas Enge 
 ;;; Copyright © 2014 Cyrill Schenkel 
 ;;; Copyright © 2014 Ian Denhardt 
+;;; Copyright © 2015 Paul van der Walt 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,6 +28,8 @@
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages avahi)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages doxygen)
@@ -35,6 +38,7 @@
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages video)
@@ -153,7 +157,7 @@ terminal using ncurses.")
 (define ncmpcpp
   (package
 (name "ncmpcpp")
-(version "0.5.10")
+(version "0.6.2")
 (source (origin
   (method url-fetch)
   (uri
@@ -161,11 +165,27 @@ terminal using ncurses.")
   version ".tar.bz2"))
   (sha256
(base32
-"1a54g6dary1rirrny9fd0hpxpyyffypni3mpbdpvmjnrl9v56vgz"
+"1mrd6m6ph0fscxp9x96ipxh6ai7w0n1miapcfqrqfy058qx5zbck"
 (build-system gnu-build-system)
 (inputs `(("libmpdclient" ,libmpdclient)
+  ("boost"  ,boost)
+  ("readline" ,readline)
   ("ncurses" ,ncurses)))
-(native-inputs `(("pkg-config" ,pkg-config)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)
+   ("automake" ,automake)
+   ("autoconf" ,autoconf)
+   ("libtool" ,libtool)))
+(arguments
+ '(#:configure-flags
+   '("BOOST_LIB_SUFFIX=")
+   #:phases
+   (alist-cons-after
+'unpack 'autogen
+(lambda _
+  (setenv "NOCONFIGURE" "true")
+  (zero? (system* "sh" "autogen.sh")))
+%standard-phases)))
 (synopsis "Featureful ncurses based MPD client inspired by ncmpc")
 (description "Ncmpcpp is an mpd client with a UI very similar to ncmpc,
 but it provides new useful features such as support for regular expressions
-- 
2.3.1

Re: [PATCH 2/3]: Add pyyaml.

[Andreas Enge]

Hello,

On Thu, Feb 26, 2015 at 02:40:05PM +0100, Ricardo Wurmus wrote:
> * gnu/packages/python.scm (python-pyyaml, python2-pyyaml): New variables.

this looks good, please push.

> * gnu/packages/bioinformatics.scm (python2-pybedtools): New variable.
> +(synopsis "Python wrapper for BEDtools programs")

This sounds as if the result is a python stand-alone program and not a
library? In the first case, it should be called "pybedtools". Otherwise
okay to push.

Andreas

Re: [PATCH] gnu: Add CLIPper.

[Andreas Enge]

Okay to push.

Andreas

Re: [PATCHES] Some cleanups for core-updates

[Ludovic Courtès]

The two patches look good to me, OK to apply.

Thanks,
Ludo’.

Re: 01/02: utils: Change 'patch-shebangs' to use binary input.

[Ludovic Courtès]

Mark H Weaver  skribis:

> Ludovic Courtès  writes:
>
>> commit ca1e3ad2faa59d5b32289f84e0937fa476e21a1a
>> Author: Ludovic Courtès 
>> Date:   Sat Feb 28 01:01:51 2015 +0100
>>
>> utils: Change 'patch-shebangs' to use binary input.
>> 
>> * guix/build/utils.scm (get-char*): New procedure.
>>   (patch-shebang): Use it instead of 'read-char'.
>>   (fold-port-matches): Remove local 'get-char' and use 'get-char*'
>>   instead.
>> ---
>>  guix/build/utils.scm |   22 +++---
>>  1 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/guix/build/utils.scm b/guix/build/utils.scm
>> index a3f8911..c98c4ca 100644
>> --- a/guix/build/utils.scm
>> +++ b/guix/build/utils.scm
>> @@ -618,6 +618,14 @@ transferred and the continuation of the transfer as a 
>> thunk."
>>   (stat:atimensec stat)
>>   (stat:mtimensec stat)))
>>  
>> +(define (get-char* p)
>> +  ;; We call it `get-char', but that's really a binary version
>> +  ;; thereof.  (The real `get-char' cannot be used here because our
>> +  ;; bootstrap Guile is hacked to always use UTF-8.)
>> +  (match (get-u8 p)
>> +((? integer? x) (integer->char x))
>> +(x x)))
>> +
>
> This is equivalent to reading with the ISO-8859-1 encoding.  The problem
> is that the procedures that use 'get-char*' will then typically use
> UTF-8 to write these characters back, so all non-ASCII characters will
> get corrupted by these filters.
>
> For now, I would suggest just using ISO-8859-1 for all of these build
> utilities that filter or substitute existing files, and then use the
> textual I/O procedures.

The difficulty is that ISO-8859-1 is not available during bootstrap, due
to guile-default-utf8.patch.

Commit dd0a8ef asks for ISO-8859-1 in the patch-* procedures, as you
suggest, but in reality during bootstrap what happens is not exactly
that.

If the bootstrap glibc had statically-linked gconv modules, we could get
rid of guile-default-utf8.patch.

> A better solution going forward would be to implement and use a
> permissive UTF-8 encoding in Guile.

Probably, although it’s not completely clear to me how that would work.
I suppose the idea would be to change to ISO-8859-1 when an invalid byte
sequence is encountered?

Ludo’.

Re: [PATCH] gnu: Add crossmap.

[Ludovic Courtès]

Ricardo Wurmus  skribis:

> From e93da9b48bafbbfa56fe348cabad9e074eda63fb Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus 
> Date: Thu, 26 Feb 2015 16:34:49 +0100
> Subject: [PATCH] gnu: Add crossmap.
>
> * gnu/packages/bioinformatics.scm (crossmap): New variable.
> * gnu/packages/patches/crossmap-allow-system-pysam.patch: New file.
> * gnu-system.am (dist_patch_DATA): Add it.

[...]

> diff --git a/gnu/packages/patches/crossmap-allow-system-pysam.patch 
> b/gnu/packages/patches/crossmap-allow-system-pysam.patch
> new file mode 100644
> index 000..a16f901
> --- /dev/null
> +++ b/gnu/packages/patches/crossmap-allow-system-pysam.patch

Please add a comment at the top of this file explaining what it does and
what its upstream status is.

OK to commit with this change.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add MACS.

[Ludovic Courtès]

Ricardo Wurmus  skribis:

> From 9c69ab1e5f1091e1f36d8ca7716c7c394d09e4c2 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus 
> Date: Thu, 26 Feb 2015 17:10:39 +0100
> Subject: [PATCH] gnu: Add MACS.
>
> * gnu/packages/bioinformatics.scm (macs): New variable.

LGTM, thanks.

Ludo'.

Re: [PATCH] gnu: Add txt2man.

[Ludovic Courtès]

Ricardo Wurmus  skribis:

> From dbaea840188e9241f3db81ec40b6282cf6848459 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus 
> Date: Fri, 27 Feb 2015 08:32:58 +0100
> Subject: [PATCH] gnu: Add txt2man.
>
> * gnu/packages/man.scm (txt2man): New variable.

LGTM, thanks.

Ludo'.

Re: [PATCH] ncmpcpp version update, mail.scm copyright line

[David Thompson]

Paul van der Walt  writes:

> Included are 2 patches: one to update the copyright line in mail.scm,
> since i forgot that when bumping the mu version, and another to upgrade
> ncmpcpp, the MPD client, to latest stable.

I've pushed these patches.  I modified your commit log to say "0.6.2"
instead of "v0.6.2", changed past tense verbs to present tense, and left
out the part about copyright.

> Another question for you all: i would like to package MPC, the MPD cli
> client, but mpc is already the name of the GNU multiprecision
> library. What should i call this mpc package? Since i know that Guixers
> are prone to long debates about names (i jest :p), here's my single
> suggestion:
>
> * mpc-client

Perhaps the GNU MPC package should be called "libmpc"?  Andreas,
thoughts?

In the meantime, don't let the naming issue stop you from packaging mpc.
We can figure that out at the end.

Thanks!

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

Re: [PATCH] ncmpcpp version update, mail.scm copyright line

[Paul van der Walt]

On 2015-02-28 at 16:04, quoth David Thompson:
> I've pushed these patches.  I modified your commit log to say "0.6.2"
> instead of "v0.6.2", changed past tense verbs to present tense, and left
> out the part about copyright.

Thanks!

>> * mpc-client
>
> Perhaps the GNU MPC package should be called "libmpc"?  Andreas,
> thoughts?
>
> In the meantime, don't let the naming issue stop you from packaging mpc.
> We can figure that out at the end.

It's packaged, so when there's a name-decision, i'll send along a patch!

Cheers,
p.

Re: [PATCH] ncmpcpp version update, mail.scm copyright line

[David Thompson]

Paul van der Walt  writes:

> On 2015-02-28 at 16:04, quoth David Thompson:
>> In the meantime, don't let the naming issue stop you from packaging mpc.
>> We can figure that out at the end.
>
> It's packaged, so when there's a name-decision, i'll send along a patch!

Feel free to send the patch along now and we can get the rest of the
code review out of the way.  :)

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

[PATCHES] Propagate inputs for libxml2 and libxslt

[David Thompson]

Two small patches below for propagating the necessary inputs for libxml2
and libxslt.  These should probably be applied to core-updates, right?
Notably, these patches triggers a rebuild of subversion.

Once these patches are applied, would it be a good idea to go through
the packages that depend on libxml2 and libxslt and remove the now
propagated inputs?

>From a86da0014e02aa73b1e7554edc9c0cd580608c9d Mon Sep 17 00:00:00 2001
From: David Thompson 
Date: Fri, 27 Feb 2015 16:59:37 -0500
Subject: [PATCH 1/2] gnu: libxml2: Propagate zlib.

* gnu/packages/xml.scm (libxml2): Propagate zlib input.
---
 gnu/packages/xml.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index f2b3baa..ae2227f 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -65,7 +65,8 @@ things the parser might find in the XML document (like start tags).")
 (build-system gnu-build-system)
 (home-page "http://www.xmlsoft.org/";)
 (synopsis "C parser for XML")
-(inputs `(("zlib" ,zlib)))
+(propagated-inputs
+ `(("zlib" ,zlib))) ;; -lz is in the .pc file
 (native-inputs `(("perl" ,perl)
  ("python" ,python-2))) ; incompatible with Python 3 (print syntax)
 
-- 
2.1.4

>From 44675222f65f3e539dd66ff604ab97f0ef3c55de Mon Sep 17 00:00:00 2001
From: David Thompson 
Date: Fri, 27 Feb 2015 21:12:20 -0500
Subject: [PATCH 2/2] gnu: libxslt: Propagate libxml2.

* gnu/packages/xml.scm (libxslt): Propagate libxml2.
---
 gnu/packages/xml.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index ae2227f..675a3ff 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -118,9 +118,9 @@ things the parser might find in the XML document (like start tags).")
 (home-page "http://xmlsoft.org/XSLT/index.html";)
 (synopsis "C library for applying XSLT stylesheets to XML documents")
 (inputs `(("libgcrypt" ,libgcrypt)
-  ("libxml2" ,libxml2)
-  ("python" ,python-wrapper)
-  ("zlib" ,zlib)))
+  ("python" ,python-wrapper)))
+(propagated-inputs
+ `(("libxml2" ,libxml2))) ;; -lxml2 is in the .pc file
 (description
  "Libxslt is an XSLT C library developed for the GNOME project.  It is
 based on libxml for XML parsing, tree manipulation and XPath support.")
-- 
2.1.4


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

Re: [PATCH] ncmpcpp version update, mail.scm copyright line

[Andreas Enge]

On Sat, Feb 28, 2015 at 10:04:26AM -0500, David Thompson wrote:
> Perhaps the GNU MPC package should be called "libmpc"?  Andreas,
> thoughts?

Oh no, I came first :-) Well, in Guix at least.

This is a complete clash, two projects with the exact same name. So we need
to make something up. I would suggest "mpd-mpc".

Andreas

Re: [PATCHES] Propagate inputs for libxml2 and libxslt

[Andreas Enge]

On Sat, Feb 28, 2015 at 10:28:35AM -0500, David Thompson wrote:
> Two small patches below for propagating the necessary inputs for libxml2
> and libxslt.  These should probably be applied to core-updates, right?
> Notably, these patches triggers a rebuild of subversion.
> 
> Once these patches are applied, would it be a good idea to go through
> the packages that depend on libxml2 and libxslt and remove the now
> propagated inputs?

I would say "yes" to all.

Andreas

[PATCH] Add mpc, the mpd client

[Paul van der Walt]

Hello,

Here's mpc, packaged as mpd-mpc, since mpc, Andreas' library, has
already squatted the name 'mpc' :p

Unhello,
p.
>From 20110c1b5d4761b26910d8958d150ced68c1c60a Mon Sep 17 00:00:00 2001
From: Paul van der Walt 
Date: Sat, 28 Feb 2015 18:22:03 +0100
Subject: [PATCH] gnu: mpd-mpc: Add mpc, the client for mpd.

* gnu/packages/mpd.scm (mpd-mpc): Add mpc, the command-line client for mpd.
---
 gnu/packages/mpd.scm | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 550e75d..8e798ee 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -45,6 +45,7 @@
   #:use-module (gnu packages xiph)
   #:export (libmpdclient
 mpd
+mpd-mpc
 ncmpc
 ncmpcpp))
 
@@ -130,6 +131,28 @@ protocol.")
 (home-page "http://www.musicpd.org/";)
 (license license:gpl2)))
 
+(define mpd-mpc
+  (package
+(name "mpd-mpc")
+(version "0.26")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append "http://www.musicpd.org/download/mpc/";
+  (car (string-split version #\.))
+  "/mpc-" version ".tar.xz"))
+  (sha256
+   (base32
+"0hp2qv6w2v902dhrmck5hg32s1ai6xiv9n61a3n6prfcfdqmywr0"
+(build-system gnu-build-system)
+(inputs `(("libmpdclient" ,libmpdclient)))
+(native-inputs `(("pkg-config" ,pkg-config)))
+(synopsis "Music Player Daemon client")
+(description "MPC is a minimalist command line interface to MPD, the music
+player daemon.")
+(home-page "http://www.musicpd.org/clients/mpc/";)
+(license license:gpl2)))
+
 (define ncmpc
   (package
 (name "ncmpc")
-- 
2.3.1

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

[David Thompson]

Ludovic Courtès  writes:

> David Thompson  skribis:
>
>> Found one big issue with adding a $PATH search path specification to a
>> package: It messes up the 'set-paths' phase of 'gnu-build-system'.
>> $PATH ends up being unset!
>>
>> environment variable `PATH' set to 
>> `/gnu/store/dwjlh4id7ksdjiigfddw5dq617bajxxm-ruby-2.2.0/bin:/gnu/store/cdgpj8djhvfwsysa0bklx7l17bkjgnr6-git-2.2.1/bin:/gnu/store/paknwghpb3530zpw6kjzygcwyi4v2b7a-tar-1.28/bin:/gnu/store/gzfwcp3rx6vx9yhfn258pqravsihkhgk-gzip-1.6/bin:/gnu/store/v47nyd4lmk6079lahhn7qjg1x30sq6r0-bzip2-1.0.6/bin:/gnu/store/45cspsg2pi0d9n1x62r85iaf6118scnr-xz-5.0.4/bin:/gnu/store/b1hflfspi7d8y8d6xxsm1hpmh1s6aki9-file-5.22/bin:/gnu/store/5x6ypvynrc4y3dnynqj948c6xdhpagv8-diffutils-3.3/bin:/gnu/store/q1fk0vrzdz7vzawq32k2slpgxhrlq0b3-patch-2.7.1/bin:/gnu/store/b1msmz538khma08mg8dm6lw0vkjilbjd-sed-4.2.2/bin:/gnu/store/izbkwxcgikxlinj78lh1934f39n98mn2-findutils-4.4.2/bin:/gnu/store/jyib7byzyincn3q7mkkrm9q5wfbg105z-gawk-4.1.1/bin:/gnu/store/s7jlv9f6v23h17bnkbvcvqk1qnhg40pb-grep-2.21/bin:/gnu/store/vgjlzkg84jpzvz227ac5aygqx25bb6wh-coreutils-8.23/bin:/gnu/store/dvlp6nk7avz403585k9xndl6zqy6vwmj-make-4.1/bin:/gnu/store/nx4zd42igyb7ghmv4mxv6ncg8wr7ypa1-bash-4.3.33/bin:/gnu/store/4x401cpj6nmddji54l99cl89ggn5pgib-ld-wrapper-0/bin:/gnu/store/h7lqkyf4sc37lkbmnph9kmmsfqr3xk5n-binutils-2.25/bin:/gnu/store/16j0v2km34g471cs77gxlq0n0a956cw1-gcc-4.8.4/bin:/gnu/store/q2mm1wv4a3g0b29yv0rjybfjh8kr07qi-glibc-2.20/bin:/gnu/store/q2mm1wv4a3g0b29yv0rjybfjh8kr07qi-glibc-2.20/sbin'
>> environment variable `PATH' unset
>>
>> I think this can be remedied with a bit more work.
>
> I think that’s because build systems are still passed a non-merged
> list, no?

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?  I'm giving it a
shot on my laptop, but if my code fails I won't be very motivated to
toture my computer with another full rebuild.

Also, since I posted the original patch set, I have refactored the code
a bit, resulting in this new procedure in (gnu packages):

(define* (packages->search-path-specifications packages #:key (native? #t))
  "Deduplicate and merge search path specifications in PACKAGES, a list of
package objects.  When NATIVE? is '#t', return native search path
specifications, or standard search path specifications otherwise."
  (merge-search-path-specifications
   (append %base-search-path-specifications
   (delete-duplicates
(append-map (if native?
package-native-search-paths
package-search-paths)
packages)

It factorizes the pattern used in the 'guix package' and 'guix
environment' commands, as well as the 'bag->derivation' and
'bag->cross-derivation' procedures.

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

[Sebastian Ramacher] Re: zathura license

[Paul van der Walt]

Hello Guix,

I'd like to package a program with the "zlib license" which i hadn't
heard of before. How would i do that given that it seems `license:..`
terms only exist for GPL and BSD, roughly?

According to The Internet this license is GPL compatible, so can i go
ahead?

Thanks,
p.

On 2015-02-28 at 18:43, quoth Sebastian Ramacher:
> See the LICENSE file contained in every tarball from pwmt.org:
> https://git.pwmt.org/?p=zathura.git;a=blob;f=LICENSE;h=f115cbe8b759ee811ab5ce896678ae320f354abd;hb=HEAD
>
> This is the same license zlib uses
> (https://en.wikipedia.org/wiki/Zlib_license)

Re: [Sebastian Ramacher] Re: zathura license

[Paul van der Walt]

Um, i'm sorry for the noise on the mailing list, i just realised Zlib is
packaged in Guix, so i looked, and i can use the built-in
`license:zlib`.

/me goes into the corner to feel ashamed :p

Ciao,
p.

On 2015-02-28 at 18:47, quoth Paul van der Walt:
> I'd like to package a program with the "zlib license" which i hadn't
> heard of before. How would i do that given that it seems `license:..`
> terms only exist for GPL and BSD, roughly?
>
> According to The Internet this license is GPL compatible, so can i go
> ahead?

Re: [Sebastian Ramacher] Re: zathura license

[Andreas Enge]

Independently of this special case, have a look at guix/licenses.scm.
There are plenty of licenses!

Andreas

Re: [PATCH] Add mpc, the mpd client

[David Thompson]

Paul van der Walt  writes:

> Here's mpc, packaged as mpd-mpc, since mpc, Andreas' library, has
> already squatted the name 'mpc' :p

Pushed, thanks!  I adjusted the commit message to follow our usual
style:

gnu: Add mpd-mpc.

* gnu/packages/mpd.scm (mpd-mpc): New variable.

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

[PATCH] gnu: Add mpdscribble.

[David Thompson]

>From f0c0cae0aef184c6bb1d9340334ca1601113e1eb Mon Sep 17 00:00:00 2001
From: David Thompson 
Date: Sat, 28 Feb 2015 14:24:52 -0500
Subject: [PATCH] gnu: Add mpdscribble.

* gnu/packages/mpd.scm (mpdscribble): New variable.
---
 gnu/packages/mpd.scm | 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 2d7ca6e..05fdaf1 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 David Thompson 
+;;; Copyright © 2014, 2015 David Thompson 
 ;;; Copyright © 2014 Andreas Enge 
 ;;; Copyright © 2014 Cyrill Schenkel 
 ;;; Copyright © 2014 Ian Denhardt 
@@ -211,3 +211,25 @@ for library searches, extended song format, items filtering, the ability to
 sort playlists, and a local filesystem browser.")
 (home-page "http://ncmpcpp.rybczak.net/";)
 (license license:gpl2+)))
+
+(define-public mpdscribble
+  (package
+(name "mpdscribble")
+(version "0.22")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "http://www.musicpd.org/download/mpdscribble/";
+  version "/mpdscribble-" version ".tar.gz"))
+  (sha256
+   (base32
+"0f0ybx380x2z2g1qvdndpvcrhkrgsfqckhz3ryydq2w3pl12v27z"
+(build-system gnu-build-system)
+(inputs `(("libmpdclient" ,libmpdclient)
+  ("curl" ,curl)
+  ("glib" ,glib)))
+(native-inputs `(("pkg-config" ,pkg-config)))
+(synopsis "MPD client for track scrobbling")
+(description "mpdscribble is a Music Player Daemon client which submits
+information about tracks being played to a scrobbler, such as Libre.FM.")
+(home-page "http://mpd.wikia.com/wiki/Client:Mpdscribble";)
+(license license:gpl2+)))
-- 
2.1.4


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

Re: [PATCH] ncmpcpp version update, mail.scm copyright line

[Ludovic Courtès]

Andreas Enge  skribis:

> This is a complete clash, two projects with the exact same name. So we need
> to make something up. I would suggest "mpd-mpc".

+1

Ludo'.

Re: [PATCHES] Propagate inputs for libxml2 and libxslt

[Ludovic Courtès]

Andreas Enge  skribis:

> On Sat, Feb 28, 2015 at 10:28:35AM -0500, David Thompson wrote:
>> Two small patches below for propagating the necessary inputs for libxml2
>> and libxslt.  These should probably be applied to core-updates, right?
>> Notably, these patches triggers a rebuild of subversion.
>> 
>> Once these patches are applied, would it be a good idea to go through
>> the packages that depend on libxml2 and libxslt and remove the now
>> propagated inputs?
>
> I would say "yes" to all.

Me too!

Ludo’.

Re: [PATCH] gnu: Add mpdscribble.

[Ludovic Courtès]

David Thompson  skribis:

> From f0c0cae0aef184c6bb1d9340334ca1601113e1eb Mon Sep 17 00:00:00 2001
> From: David Thompson 
> Date: Sat, 28 Feb 2015 14:24:52 -0500
> Subject: [PATCH] gnu: Add mpdscribble.
>
> * gnu/packages/mpd.scm (mpdscribble): New variable.

LGTM.

> +(home-page "http://mpd.wikia.com/wiki/Client:Mpdscribble";)

Shouldn’t it be musicpd.org?

Ludo’.

Re: [PATCH] gnu: Add ruby-hoe.

[Ludovic Courtès]

David Thompson  skribis:

> From c4753f392ea85840f7fe84baf319c08591bb6b4b Mon Sep 17 00:00:00 2001
> From: David Thompson 
> Date: Mon, 23 Feb 2015 18:22:31 -0500
> Subject: [PATCH] gnu: Add ruby-hoe.
>
> * gnu/packages/ruby.scm (ruby-hoe): New variable.

LGTM, thanks.

Ludo’.

Re: [PATCH] gnu: Add bundler.

[Ludovic Courtès]

David Thompson  skribis:

> From c753913eca6180a1382379c1de96d222a17c Mon Sep 17 00:00:00 2001
> From: David Thompson 
> Date: Mon, 23 Feb 2015 19:10:57 -0500
> Subject: [PATCH] gnu: Add bundler.
>
> * gnu/packages/ruby.scm (bundler): New variable.

OK!

Ludo'.

Re: [PATCH] build: ruby: Install executables in /bin.

[Ludovic Courtès]

David Thompson  skribis:

> From af6a7e03fc6debea314b88d616d035acc1b6ed50 Mon Sep 17 00:00:00 2001
> From: David Thompson 
> Date: Fri, 27 Feb 2015 12:03:20 -0500
> Subject: [PATCH] build: ruby: Install executables in /bin.
>
> * guix/build/ruby-build-system.scm (install): Add '--bindir' flag to gem
>   command.

Sounds good.

Do you know what the rationale is for bindir to default to
lib/ruby/gems/X.Y?  Parallel-installability?

That makes the search path specification for $PATH useless, right?

Thanks,
Ludo’.

Re: [PATCH] build: ruby: Install executables in /bin.

[David Thompson]

Ludovic Courtès  writes:

> David Thompson  skribis:
>
>> From af6a7e03fc6debea314b88d616d035acc1b6ed50 Mon Sep 17 00:00:00 2001
>> From: David Thompson 
>> Date: Fri, 27 Feb 2015 12:03:20 -0500
>> Subject: [PATCH] build: ruby: Install executables in /bin.
>>
>> * guix/build/ruby-build-system.scm (install): Add '--bindir' flag to gem
>>   command.
>
> Sounds good.
>
> Do you know what the rationale is for bindir to default to
> lib/ruby/gems/X.Y?  Parallel-installability?

I don't know exactly, but it seems like parallel-installability.  Each
gem is installed to a directory that corresponds to its name + version,
so it would make sense.  I also read somewhere that OS X also configures
'gem' to use /usr/local/bin (I think) as the bindir.

> That makes the search path specification for $PATH useless, right?

Yup.  :)

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

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

[Andreas Enge]

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).

Andreas

Re: [PATCH] gnu: Add mpdscribble.

[David Thompson]

Ludovic Courtès  writes:

> David Thompson  skribis:
>
>> From f0c0cae0aef184c6bb1d9340334ca1601113e1eb Mon Sep 17 00:00:00 2001
>> From: David Thompson 
>> Date: Sat, 28 Feb 2015 14:24:52 -0500
>> Subject: [PATCH] gnu: Add mpdscribble.
>>
>> * gnu/packages/mpd.scm (mpdscribble): New variable.
>
> LGTM.
>
>> +(home-page "http://mpd.wikia.com/wiki/Client:Mpdscribble";)
>
> Shouldn’t it be musicpd.org?

This is a weird case.  You'd think it would be on musicpd.org, because
that's where the source is.  However, musicpd.org doesn't mention it!
It isn't listed on , and that page
sends users to the wiki for more clients.  Debian uses the wikia page as
the home page, as well.  Due to this weird situation, is it alright if I
leave the home-page as-is and add a comment to explain?

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

Re: [PATCH] build: ruby: Add gitify phase.

[David Thompson]

David Thompson  writes:

> This patch solves a blocking issue for packaging a very large number of
> Ruby gems, which is that the build process assumes you are working out
> of a git repository.

Bump.  I'm going to push this with the other Ruby related patches I've
made recently if there are no objections.

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

[PATCH 1/5] gnu: Add efl.

[Tomáš Čech]

* gnu/packages/enlightenment.scm: New file
* gnu/packages/enlightenment.scm (efl): New variable.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am  |   1 +
 gnu/packages/enlightenment.scm | 140 +
 2 files changed, 141 insertions(+)
 create mode 100644 gnu/packages/enlightenment.scm

diff --git a/gnu-system.am b/gnu-system.am
index e42e89a..21847cc 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -90,6 +90,7 @@ GNU_SYSTEM_MODULES =  \
   gnu/packages/elf.scm \
   gnu/packages/emacs.scm   \
   gnu/packages/enchant.scm \
+  gnu/packages/enligtenment.scm\
   gnu/packages/feh.scm  \
   gnu/packages/file.scm\
   gnu/packages/firmware.scm\
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
new file mode 100644
index 000..6ea0dd5
--- /dev/null
+++ b/gnu/packages/enlightenment.scm
@@ -0,0 +1,140 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Tomáš Čech 
+;;;
+;;; 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 efl)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages fribidi)
+  #:use-module (gnu packages game-development)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages lua)
+  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages photo)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages xorg))
+
+(define-public efl
+  (package
+(name "efl")
+(version "1.13.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"http://download.enlightenment.org/rel/libs/efl/efl-";
+version ".tar.gz"))
+  (sha256
+   (base32 
"0mwkxsfi5masiy6qfmdqy1j15cfz7nz8g8jq2bf3w501rpa9gxvz"
+(build-system gnu-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("alsa-lib" ,alsa-lib)
+   ("compositeproto" ,compositeproto)
+   ("curl" ,curl)
+   ("giflib" ,giflib)
+   ("gstreamer" ,gstreamer)
+   ("gst-plugins-base" ,gst-plugins-base)
+   ("harfbuzz" ,harfbuzz)
+   ("libexif" ,libexif)
+   ("libjpeg" ,libjpeg)
+   ("librsvg" ,librsvg)
+   ("libtiff" ,libtiff)
+   ("libx11" ,libx11)
+   ("libxcomposite" ,libxcomposite)
+   ("libxcursor" ,libxcursor)
+   ("libxdmcp" ,libxdmcp)
+   ("libxext" ,libxext)
+   ("libxi" ,libxi)
+   ("libxkbfile" ,libxkbfile)
+   ("libxinerama" ,libxinerama)
+   ("libxp" ,libxp)
+   ("libxrandr" ,libxrandr)
+   ("libxscrnsaver" ,libxscrnsaver)
+   ("libxtst" ,libxtst)
+   ("mesa" ,mesa)
+   ("printproto" ,printproto)
+   ("scrnsaverproto" ,scrnsaverproto)
+   ("valgrind" ,valgrind)
+   ("xextproto" ,xextproto)
+   ("xinput" ,xinput)
+   ("xpr" ,xpr)
+   ("xproto" ,xproto)))
+(propagated-inputs
+ ; all these inputs are in package config files in section
+ ; Require.private
+ `(("bullet" ,bullet) ; ephysics.pc
+   ("dbus" ,dbus) ; eldbus.pc
+   ("eudev" ,eudev) ; eeze.pc
+   ("fontconfig" ,fontconfig) ; evas.pc
+   ("freetype" ,freetype) ; evas.pc
+   ("fribidi" ,fribidi) ; evas.pc
+   ("glib" ,glib) ; ecore.pc
+   ("libpng" ,libpng) ; evas.pc, evas-cxx.pc
+   ("libsndfile" ,libsndfile) ; ecore-audio.pc, ecore-audio-cxx.pc
+   ("luajit" ,luajit) ; evas.pc, edje.pc
+   ("openssl" ,openssl) ; eet.pc, ecore-con.pc
+   ("pulseaudio" ,pulseaudio) ; ecore-audio.pc, ecore-audio-cxx.pc
+

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

[Tomáš Čech]

* gnu/packages/enlightenment.scm (emotion-generic-players): New variable.
---
 gnu/packages/enlightenment.scm | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 9e471bd..ebfd0d7 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -42,6 +42,7 @@
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages video)
   #:use-module (gnu packages xorg))
 
 (define-public efl
@@ -195,3 +196,29 @@ friendly, energy efficient and good looking.  It consists 
of:
 and applications allowing to natively open pictures, documents and media
 files in Evas (EFL canvas library).")
 (license license:gpl2+)))
+
+(define-public emotion-generic-players
+  (package
+(name "emotion-generic-players")
+(version "1.13.0")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append
+
"http://download.enlightenment.org/rel/libs/emotion_generic_players/emotion_generic_players-";
+version ".tar.gz"))
+  (sha256
+   (base32 
"0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3"
+(build-system gnu-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("efl" ,efl)
+   ("vlc" ,vlc)))
+(home-page "http://www.enlightenment.org";)
+(synopsis "Plugins for integrating media players in EFL based 
applications")
+(description
+ "Emotion-generic-players is collection of interfaces to outside libraries
+and applications allowing to natively play video files through Emotion.
+The only supported now is VLC.")
+(license license:bsd-2)))
-- 
2.0.5

[PATCH 5/5] gnu: Add terminology.

[Tomáš Čech]

* gnu/packages/enlightenment.scm (terminology): New variable.
---
 gnu/packages/enlightenment.scm | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index ebfd0d7..73dd369 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -222,3 +222,38 @@ files in Evas (EFL canvas library).")
 and applications allowing to natively play video files through Emotion.
 The only supported now is VLC.")
 (license license:bsd-2)))
+
+(define-public terminology
+  (package
+(name "terminology")
+(version "0.8.0")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append
+
"http://download.enlightenment.org/rel/apps/terminology/terminology-";
+version ".tar.gz"))
+  (sha256
+   (base32 
"0a767ixackzmhb2awrhjy7q6vsivsd54wc434i617xiw095x843s"
+(build-system gnu-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("efl" ,efl)
+   ("elementary" ,elementary)))
+(home-page "http://www.enlightenment.org";)
+(synopsis "Powerful terminal emulator based on EFL")
+(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")
+(license license:bsd-2)))
-- 
2.0.5

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

[Tomáš Čech]

* gnu/packages/enlightenment.scm (evas-generic-loaders): New variable.
---
 gnu/packages/enlightenment.scm | 32 
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 0d7aa79..9e471bd 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -28,6 +28,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages game-development)
+  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
@@ -36,6 +37,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages openssl)
+  #:use-module (gnu packages pdf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
@@ -163,3 +165,33 @@ friendly, energy efficient and good looking.  It consists 
of:
  Libraries.  It is build upon Edje and Evas libraries and uses full 
capabilities
  of EFL.")
 (license license:lgpl2.1)))
+
+(define-public evas-generic-loaders
+  (package
+(name "evas-generic-loaders")
+(version "1.13.0")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append
+
"http://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-";
+version ".tar.gz"))
+  (sha256
+   (base32 
"16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63"
+(build-system gnu-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("gstreamer" ,gstreamer)
+   ("gst-plugins-base" ,gst-plugins-base)
+   ("efl" ,efl)
+   ("librsvg" ,librsvg)
+   ("libspectre" ,libspectre)
+   ("poppler" ,poppler)))
+(home-page "http://www.enlightenment.org";)
+(synopsis "Plugins for integration of various file types into Evas")
+(description
+ "Evas-generic-loaders is collection of interfaces to outside libraries
+and applications allowing to natively open pictures, documents and media
+files in Evas (EFL canvas library).")
+(license license:gpl2+)))
-- 
2.0.5

EFL, elementary, loaders, players and terminology - round 2

[Tomáš Čech]

Hi,

thank you for your kind review and your comments.

Changes since previous round:

- efl.scm renamed to enlightenment.scm
- descriptions are descriptive and consist of sentences with
  punctuation
- too long lines were shortened
- lonely parens made friends on previous line
- removed unnecessary input bash
- verified that Makefile.in.in substitution is really needed
- added information about reasons for propagated-inputs and improved
  the list a bit

Thanks in advance for another review round.

S_W

[PATCH 2/5] gnu: Add elementary.

[Tomáš Čech]

* gnu/packages/enlightenment.scm (elementary): New variable.
---
 gnu/packages/enlightenment.scm | 25 +
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 6ea0dd5..0d7aa79 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -138,3 +138,28 @@ friendly, energy efficient and good looking.  It consists 
of:
  * Emotion - multimedia integration
  * Ethumb - image thumbnail support")
 (license (list license:bsd-2 license:lgpl2.1 license:zlib ; different 
parts under different licenses
+
+(define-public elementary
+  (package
+(name "elementary")
+(version "1.13.0")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append
+
"http://download.enlightenment.org/rel/libs/elementary/elementary-";
+version ".tar.gz"))
+  (sha256
+   (base32 
"133p4yaynmy37yhk2gxwlc8a2n2wy7cbh4rd7nsnl5929wqb9waj"
+(build-system gnu-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("efl" ,efl)))
+(home-page "http://www.enlightenment.org";)
+(synopsis "Widget library of Enlightenment world")
+(description
+ "Elementary is widget library/toolkit, part of Enlightenment Foundation
+ Libraries.  It is build upon Edje and Evas libraries and uses full 
capabilities
+ of EFL.")
+(license license:lgpl2.1)))
-- 
2.0.5

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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
 (native-inputs
  `(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
-- 
2.1.2

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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

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

[宋文武]

* 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