[PATCH] gnu: Add s2tc.

[Taylan Ulrich Bayırlı/Kammer]

This adds s2tc as an input to mesa, and uses a mesa-without-s2tc package
as an input to s2tc to solve a cyclic dependency.

The resulting s2tc package does *not* link to any libraries in the
mesa-without-s2tc package (it's not a requisite as per "guix gc -R"), so
this should be safe, as in the user won't end up with two different
libGL images in memory.

>From 9b23215a9ab474c2f03c6ae2c888672beb4b4f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 
Date: Wed, 11 Mar 2015 21:49:24 +0100
Subject: [PATCH] gnu: Add s2tc.

* gnu/packages/gl.scm (s2tc): New variable.
(mesa): Add input s2tc.
(mesa-without-s2tc): New variable.
---
 gnu/packages/gl.scm | 43 ++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 7d549d3..ba5f8a4 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -21,11 +21,13 @@
 
 (define-module (gnu packages gl)
   #:use-module (ice-9 match)
+  #:use-module (guix build utils)
   #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages pkg-config)
@@ -123,6 +125,38 @@ rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
 Polygon meshes, and Extruded polygon meshes")
 (license l:x11)))
 
+(define-public s2tc
+  (package
+(name "s2tc")
+(version "1.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://github.com/divVerent/s2tc/archive/v"; version ".tar.gz"))
+   (sha256
+(base32 "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752"
+(build-system gnu-build-system)
+(native-inputs
+ `(("autoconf" ,autoconf)
+   ("automake" ,automake)
+   ("libtool" ,libtool)))
+(inputs
+ `(("mesa" ,mesa-without-s2tc)))
+(arguments
+ '(#:phases
+   (alist-cons-after
+'unpack 'autogen
+(lambda _
+  (zero? (system* "sh" "autogen.sh")))
+%standard-phases)))
+(home-page "https://github.com/divVerent/s2tc";)
+(synopsis "S3 Text Compression implementation")
+(description
+ "S2TC is a patent-free S3TC compatible implementation and provides
+texture compression to Mesa.")
+(license l:expat)))
+
 (define-public mesa
   (package
 (name "mesa")
@@ -153,7 +187,8 @@ Polygon meshes, and Extruded polygon meshes")
 ("libxml2" ,libxml2)
 ;; TODO: Add 'libva'
 ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
-("makedepend" ,makedepend)))
+("makedepend" ,makedepend)
+("s2tc" ,s2tc)))
 (native-inputs
   `(("pkg-config" ,pkg-config)
 ("gettext" ,gnu-gettext)
@@ -196,6 +231,12 @@ allows Mesa to be used in many different environments ranging from software
 emulation to complete hardware acceleration for modern GPUs.")
 (license l:x11)))
 
+(define-public mesa-without-s2tc
+  (package
+(inherit mesa)
+(name "mesa-without-s2tc")
+(inputs (alist-delete "s2tc" (package-inputs mesa)
+
 (define-public glew
   (package
 (name "glew")
-- 
2.2.1

[PATCH] gnu: Add taskwarrior.

[Tomáš Čech]

* gnu/packages/task.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add new file here.
---
 gnu-system.am |  1 +
 gnu/packages/task.scm | 64 +++
 2 files changed, 65 insertions(+)
 create mode 100644 gnu/packages/task.scm

diff --git a/gnu-system.am b/gnu-system.am
index 2175605..f4c92dd 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -273,6 +273,7 @@ GNU_SYSTEM_MODULES =\
   gnu/packages/swig.scm\
   gnu/packages/sxiv.scm\
   gnu/packages/synergy.scm \
+  gnu/packages/task.scm\
   gnu/packages/tbb.scm \
   gnu/packages/tcl.scm \
   gnu/packages/tcsh.scm\
diff --git a/gnu/packages/task.scm b/gnu/packages/task.scm
new file mode 100644
index 000..7fa1628
--- /dev/null
+++ b/gnu/packages/task.scm
@@ -0,0 +1,64 @@
+;;; 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 mail)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages lua)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  )
+
+(define-public taskwarrior
+  (package
+(name "taskwarrior")
+(version "2.4.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "http://taskwarrior.org/download/task-"; version ".tar.gz"))
+   (sha256 (base32
+"1qn2jwskrkqg3lszkcd37h06j4a1spfkr8z9yq17p59r8v34h3nr"
+(build-system cmake-build-system)
+(inputs
+ `(("util-linux" ,util-linux)
+   ("gnutls" ,gnutls)
+   ("lua" ,lua)
+   ("coreutils" ,coreutils)
+   ))
+;;(native-inputs
+;; `(("pkg-config" ,pkg-config)))
+(arguments
+ `(#:phases
+   (alist-cons-before
+'patch-source-shebangs 'remove-broken-symlinks
+(lambda _
+  (delete-file "src/cal")
+  (delete-file "src/calendar")
+  (delete-file "src/tw"))
+(alist-delete 'check %standard-phases
+(home-page "http://taskwarrior.org";)
+(synopsis
+ "Simple and easy to use SMTP client with decent sendmail compatibility")
+(description
+ "msmtp is an SMTP client.  In the default mode, it transmits a mail to
+an SMTP server (for example at a free mail provider) which takes care of 
further
+delivery.")
+(license license:expat)))
-- 
2.2.1

[PATCH] gnu: Add tig.

[Tomáš Čech]

* gnu/packages/version-control.scm (tig): New variable.
---
 gnu/packages/version-control.scm | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 7434ed9..cb26280 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -46,6 +46,7 @@
   #:use-module (gnu packages linux)
 ;;   #:use-module (gnu packages gnutls)
   #:use-module (gnu packages nano)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages openssl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -778,3 +779,28 @@ changes back into the master source of the program, with 
as little disruption
 as possible.  Resolution of contention for source files, a major headache for
 any project with more than one developer, is one of Aegis's major functions.")
 (license gpl3+)))
+
+(define-public tig
+  (package
+(name "tig")
+(version "2.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"http://jonas.nitro.dk/tig/releases/tig-";
+version ".tar.gz"))
+  (sha256
+   (base32
+"1c1w6w39a1dwx4whrg0ga1mhrlz095hz875z7ajn6xgmhkv8fqih"
+(build-system gnu-build-system)
+(inputs
+ `(("ncurses" ,ncurses)))
+(arguments
+ `(#:phases
+   (alist-delete 'check %standard-phases)))
+(home-page "http://jonas.nitro.dk/tig/";)
+(synopsis "ncurses-based text-mode for GIT")
+(description
+ "Tig is ncurses TUI for GIT, primary intended as history browser but can
+stage chunks for commit or colorize any GIT output.")
+(license gpl2)))
-- 
2.2.1

Re: [PATCH] A little typo in gnu/system.scm

[Tomáš Čech]

On Wed, Mar 11, 2015 at 01:41:58AM +0300, Axel wrote:

Name 'operating-system-packages' declared twice in export list in the
gnu/system.scm. I think it is a typo. Isn't it?


Yes, it seems so. Good catch :)

Re: Libreoffice building (sort of)

[白い熊＠相撲道]

On 2015-03-11 17:34, Mark H Weaver wrote:
What you've done is to roll back your Guix to the 4-month-old version 
of

Guix that the 'wip-libreoffice' branch was based on.

The proper way would be to use 'git' to rebase that branch on our
current master branch, and then use that.  "guix pull" can't do that.


I'm asking this as I see a different behavior now
with `guix package -d' and `-i' for other packages now than before,
and a lot of building from source.


That's probably because Hydra has long ago deleted the binaries from 4
months ago.


Thanks a lot for this confirmation Mark, I suspected something like this 
must have happened when I saw the sourcebuilding...


How best to proceed from here to:
- get back to current master
- keep the built libreoffice in the store

I had an idea that pulling the current master from the downloaded file 
will bring me forward again, but doesn't seem it happened - still 
building from source.


I don't use Guix from git, this is the GuixSD installed as a clean 
system from USB. Is there no other way now than to clone the git guix, 
build it an rebase? How will it interact with the GuixSD version of the 
tools? Isn't this going to lead to more conflicts? How do I insure the 
git guix will take precedende - just make sure to run local commands 
only from the git build directory?


Or would maybe now a system reconfigure bring me forward? What is the 
cleanest way?

--
白い熊＠相撲道

Re: [PATCH] Add PCB.

[Mark H Weaver]

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

> l...@gnu.org (Ludovic Courtès) writes:
>
>> Ricardo Wurmus  skribis:
>>
>>> In packaging PCB I noticed that our Mesa package loads a few libraries
>>> with dlopen() but does not use absolute paths to store items.  In the
>>> case of PCB, dlopen("libudev.so.0") fails and causes "pcb" die on
>>> startup with a segfault.  To prevent this until the Mesa package is
>>> fixed I wrapped the executable.
>>
>> OK.  Feel free to fix MESA eventually.  :-)
>
> Is anyone working on this?  Otherwise I'll look into it because I
> noticed mplayer2 has the same issue.
>
> Some basic help is appreciated by the way.  How do we generally handle
> dlopen() uses in Guix?
>
> Does our rpath stuff not fix the issue, and why?

dlopen doesn't consult rpaths.

> When the argument is a literal string, I suppose we can patch it to be
> an absolute pathname.

Yes, when we can do this, it is usually the preferred approach.

> And when it's parameterized?  E.g. when a program
> uses a private wrapper function around dlopen(), then I guess I should
> track all uses of that wrapper function?

Ideally, yes.  However, it may not always be possible.

> How about when the program dlopen()s a library of its own?  Should it be
> made an absolute path to the package's output directory?

Ideally, yes.

 Thanks!
   Mark

Re: Libreoffice building (sort of)

[Mark H Weaver]

白い熊＠相撲道  writes:

> On 2015-03-10 13:41, l...@gnu.org wrote:
>> "白い熊 @相撲道"  skribis:
>>
>>> wget
>>> http://git.savannah.gnu.org/cgit/guix.git/snapshot/wip-libreoffice.tar.gz
>>> guix pull --url=file:///path/to/wip-libreoffice.tar.gz
>>> guix package -i libreoffice
>>>
>>> It's building now, apparently everything from source, so probably a
>>> long way to go...
>>>
>>> Let's see if it will put a unable libreoffice instance in the store...
>>
>> Please let us know how it goes.  If it builds and is usable, we should
>> merge it.
>
> Well it did build indeed! And now I have a working LibreOffice in the
> store. Tested briefly, works without a hitch so far.
>
> Unrelated, but maybe you could advise me as I'm just starting to study
> Guix deeply:
>
> Have I somehow "poluted" the environment via the pull of the
> wip-libreoffice tar?

What you've done is to roll back your Guix to the 4-month-old version of
Guix that the 'wip-libreoffice' branch was based on.

The proper way would be to use 'git' to rebase that branch on our
current master branch, and then use that.  "guix pull" can't do that.

> I'm asking this as I see a different behavior now
> with `guix package -d' and `-i' for other packages now than before,
> and a lot of building from source.

That's probably because Hydra has long ago deleted the binaries from 4
months ago.

 Mark

The physical host for hydra.gnu.org is down!

[Dave Thompson]

There seems to be hardware failure on one of the FSF's servers hosted at
MIT.  Unfortunately, our Hydra VM runs on that machine, so no one will
be getting substitutes until the physical host is back up.  :(

Apologies for the downtime.

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

Re: [PATCH] Add PCB.

[Taylan Ulrich Bayırlı/Kammer]

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

> Ricardo Wurmus  skribis:
>
>> In packaging PCB I noticed that our Mesa package loads a few libraries
>> with dlopen() but does not use absolute paths to store items.  In the
>> case of PCB, dlopen("libudev.so.0") fails and causes "pcb" die on
>> startup with a segfault.  To prevent this until the Mesa package is
>> fixed I wrapped the executable.
>
> OK.  Feel free to fix MESA eventually.  :-)

Is anyone working on this?  Otherwise I'll look into it because I
noticed mplayer2 has the same issue.

Some basic help is appreciated by the way.  How do we generally handle
dlopen() uses in Guix?

Does our rpath stuff not fix the issue, and why?

When the argument is a literal string, I suppose we can patch it to be
an absolute pathname.  And when it's parameterized?  E.g. when a program
uses a private wrapper function around dlopen(), then I guess I should
track all uses of that wrapper function?

How about when the program dlopen()s a library of its own?  Should it be
made an absolute path to the package's output directory?

Taylan

Re: zsh and fish missed in /etc/shells?

[Axel]

Well, I modified the patch and now it just trivially add paths for
fish, tcsh and zsh.

For example Debian has add-shell/remove-shell scripts triggered on
package installing and removing. FTP servers like proftpd by default
check for installed shells and with this patch they will allow for a
user shells that don't really exist in a system. Probably it is not a
problem though. I noted in a changelog what we add paths
unconditionally.


2015-03-11 12:43 GMT+03:00 Ludovic Courtès :
> Axel  skribis:
>
>> And generally should we check that shells really installed or just
>> unconditionally add paths to /etc/shells? I will modify patch then.
>
> I think it’s enough to just add them unconditionally.
>
> Thanks,
> Ludo’.



-- 
Александр Графов


0001-PATCH-system-Add-fish-tcsh-zsh-to-etc-shells.patch
Description: Binary data

Re: Libreoffice building (sort of)

[白い熊＠相撲道]

On 2015-03-11 13:04, Andreas Enge wrote:

On Wed, Mar 11, 2015 at 10:27:15AM +0100, 白い熊＠相撲道 wrote:

guix substitute-binary: error: connect: Connection timed out
fetching path `/gnu/store/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28' 
failed

with exit code 1


I think this is just a random error, due to hydra being overloaded. 
Normally

you can try again and there is a good chance it will work.

Andreas


That's what I thought as well, so I tried many times, and it always 
failed thus. Inbetween though I ran it as root and it went through no 
problems, so it doesn't look like hydra was overloaded at the time.


Like I said, some strange behavior in the rebuilding of tar, bzip2, and 
module-import at the time, so thought the pull of the wip branch messed 
the system up slightly.


Currently, what I did to try to fix this - wget downloaded guix-master 
tar and pulled that file. Went through, no more bad connection errors on 
hydra...


Now it's still running, rebuilding gcc from source and from what I 
caught it'll build glibc and linux-libre... Why?


That's why I'm hoping some expert might give me a hint as to what is 
going on...

--
白い熊＠相撲道

Re: Libreoffice building (sort of)

[Andreas Enge]

On Wed, Mar 11, 2015 at 10:27:15AM +0100, 白い熊＠相撲道 wrote:
> guix substitute-binary: error: connect: Connection timed out
> fetching path `/gnu/store/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28' failed
> with exit code 1

I think this is just a random error, due to hydra being overloaded. Normally
you can try again and there is a good chance it will work.

Andreas

[PATCH] gnu: Add isync.

[Tomáš Čech]

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

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 4aa74fe..18836c1 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -29,6 +29,7 @@
   #:use-module (gnu packages backup)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages enchant)
@@ -626,4 +627,28 @@ deal of flexibility in the way mail can be routed, and 
there are extensive
 facilities for checking incoming mail.")
 (license gpl2+)))
 
+(define-public isync
+  (package
+(name "isync")
+(version "1.1.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "http://downloads.sourceforge.net/project/isync/isync/";
+ version "/isync-" version ".tar.gz"))
+   (sha256 (base32
+"1960ah3fmp75cakd06lcx50n5q0yvfsadjh3lffhyvjvj7ava9d2"
+(build-system gnu-build-system)
+(inputs
+ `(("bdb" ,bdb)
+   ("openssl" ,openssl)))
+(home-page "http://isync.sourceforge.net/";)
+(synopsis
+ "Mailbox synchronization program")
+(description
+ "isync/mbsync is command line tool for two way synchronization of
+mailboxes.  Currently Maildir and IMAP are supported types.")
+(license gpl2)))
+
 ;;; mail.scm ends here
-- 
2.2.1

Re: [PATCH] Add WenQuanYi ZenHei font.

[Ricardo Wurmus]

Ludovic Courtès writes:

>> +   (copy-file "wqy-zenhei.ttc"
>> +  (string-append font-dir "wqy-zenhei.ttc"))
>
> What format is this?

Apparently it's a TrueType font collection containing three fonts.

~~ Ricardo

Re: [PATCH] Add WenQuanYi ZenHei font.

[Ludovic Courtès]

Ricardo Wurmus  skribis:

> From caa906f41e25202ecc4546cb04a8b0b6c70e556a Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus 
> Date: Wed, 11 Mar 2015 08:55:57 +0100
> Subject: [PATCH] gnu: Add WenQuanYi ZenHei font.
>
> * gnu/packages/fonts.scm (font-wqy-zenhei): New variable.

LGTM.

> +   (copy-file "wqy-zenhei.ttc"
> +  (string-append font-dir "wqy-zenhei.ttc"))

What format is this?

Thanks,
Ludo’.

Re: zsh and fish missed in /etc/shells?

[Ludovic Courtès]

Axel  skribis:

> And generally should we check that shells really installed or just
> unconditionally add paths to /etc/shells? I will modify patch then.

I think it’s enough to just add them unconditionally.

Thanks,
Ludo’.

Re: Libreoffice building (sort of)

[白い熊＠相撲道]

On 2015-03-11 10:01, 白い熊＠相撲道 wrote:

Have I somehow "poluted" the environment via the pull of the
wip-libreoffice tar? I'm asking this as I see a different behavior now
with `guix package -d' and `-i' for other packages now than before,
and a lot of building from source. Also `# guix gc' will delete as
garbage a derivation of tar, bzip2, and module-import, and `# guix
pull' spends a long time building these from source. And thus in a
circle.


Plus, as a regular user `guix pull' will not complete, even though as 
root it does, so the connection is not the issue:


$ guix pull
starting download of `/tmp/guix-file.2KIQSf' from 
`http://git.savannah.gnu.org/cgit/guix.git/snapshot/guix-master.tar.gz'...
http://git.savannah.gnu.org/.../guix-master.tar.gz	8700.4 KiB 
transferred
substitute-binary: updating list of substitutes from 
'http://hydra.gnu.org'...
substitute-binary: guix substitute-binary: warning: while fetching 
http://hydra.gnu.org/nix-cache-info: server is somewhat slow
substitute-binary: guix substitute-binary: warning: try 
`--no-substitutes' if the problem persists

The following files will be downloaded:
   /gnu/store/kz230rqp13lbx68wwf997bn7s8jf1nc6-gzip-1.6
   /gnu/store/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28
   /gnu/store/57ss3s44vwi76rqjg0filinz88fh332w-grep-2.20
fetching path `/gnu/store/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28'...
found valid signature for 
'/gnu/store/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28', from 
'http://hydra.gnu.org/nar/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28'
downloading `/gnu/store/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28' (2.8 
MiB installed)...
guix substitute-binary: warning: while fetching 
http://hydra.gnu.org/nar/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28: 
server is somewhat slow
guix substitute-binary: warning: try `--no-substitutes' if the problem 
persists

guix substitute-binary: error: connect: Connection timed out
fetching path `/gnu/store/8n7d1bgib9f1hml2k5ravgv79jv1whqf-tar-1.28' 
failed with exit code 1

fetching path `/gnu/store/57ss3s44vwi76rqjg0filinz88fh332w-grep-2.20'...
killing process 9518
guix pull: error: build failed: some substitutes for the outputs of 
derivation `/gnu/store/94ysrjrjhkq7yclllcbkrb443d4z2il4-tar-1.28.drv' 
failed (usually happens due to networking issues); try `--fallback' to 
build derivation from source



What can I do to fix this?

--
白い熊＠相撲道

Re: Libreoffice building (sort of)

[白い熊＠相撲道]

On 2015-03-10 13:41, l...@gnu.org wrote:

"白い熊 @相撲道"  skribis:

wget 
http://git.savannah.gnu.org/cgit/guix.git/snapshot/wip-libreoffice.tar.gz

guix pull --url=file:///path/to/wip-libreoffice.tar.gz
guix package -i libreoffice

It's building now, apparently everything from source, so probably a 
long way to go...


Let's see if it will put a unable libreoffice instance in the store...


Please let us know how it goes.  If it builds and is usable, we should
merge it.


Well it did build indeed! And now I have a working LibreOffice in the 
store. Tested briefly, works without a hitch so far.


Unrelated, but maybe you could advise me as I'm just starting to study 
Guix deeply:


Have I somehow "poluted" the environment via the pull of the 
wip-libreoffice tar? I'm asking this as I see a different behavior now 
with `guix package -d' and `-i' for other packages now than before, and 
a lot of building from source. Also `# guix gc' will delete as garbage a 
derivation of tar, bzip2, and module-import, and `# guix pull' spends a 
long time building these from source. And thus in a circle.


What can I do about this?
--
白い熊＠相撲道

[PATCH] Add WenQuanYi ZenHei font.

[Ricardo Wurmus]

>From caa906f41e25202ecc4546cb04a8b0b6c70e556a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 11 Mar 2015 08:55:57 +0100
Subject: [PATCH] gnu: Add WenQuanYi ZenHei font.

* gnu/packages/fonts.scm (font-wqy-zenhei): New variable.
---
 gnu/packages/fonts.scm | 47 +++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 77abc2b..40b1722 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -359,3 +359,50 @@ fonts are intended to support the characters necessary to render or display
 text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.
 ")
 (license license:asl2.0)))
+
+(define-public font-wqy-zenhei
+  (package
+(name "font-wqy-zenhei")
+(version "0.9.45")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"mirror://sourceforge/wqy/wqy-zenhei-"
+version ".tar.gz"))
+  (file-name (string-append "wqy-zenhei-" version ".tar.gz"))
+  (sha256
+   (base32
+"1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4"
+(build-system trivial-build-system)
+(arguments
+ `(#:modules ((guix build utils))
+   #:builder
+   (begin
+ (use-modules (guix build utils))
+ (let ((PATH (string-append (assoc-ref %build-inputs "tar")  "/bin:"
+(assoc-ref %build-inputs "gzip") "/bin"))
+   (font-dir (string-append (assoc-ref %outputs "out")
+"/share/fonts/wenquanyi/")))
+   (setenv "PATH" PATH)
+   (mkdir-p font-dir)
+   (system* "tar" "xvf" (assoc-ref %build-inputs "source"))
+   (chdir "wqy-zenhei")
+   (copy-file "wqy-zenhei.ttc"
+  (string-append font-dir "wqy-zenhei.ttc"))
+(native-inputs
+ `(("gzip" ,gzip)
+   ("tar" ,tar)))
+(home-page "http://wenq.org/wqy2/";)
+(synopsis "CJK font")
+(description
+ "WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese outline
+font.  It is designed for general purpose text formatting and on-screen
+display of Chinese characters and symbols from many other languages.
+WenQuanYi Zen Hei provides a rather complete coverage to Chinese Hanzi glyphs,
+including both simplified and traditional forms.  The total glyph number in
+this font is over 35,000, including over 21,000 Chinese Hanzi.  This font has
+full coverage to GBK(CP936) charset, CJK Unified Ideographs, as well as the
+code-points needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, ja (Japanese) and
+ko (Korean) locales for fontconfig.")
+;; GPLv2 with font embedding exception
+(license license:gpl2)))
-- 
2.1.0