[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Sun, 11 Jan 2015 14:38:41 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 77448857311318fc9cd866afcb85ca98fccdb25b
Merge: 62c155c 0009ed7
Author: Mark H Weaver <address@hidden>
Date: Sun Jan 11 09:38:49 2015 -0500
Merge branch 'master' into core-updates
Makefile.am | 9 +-
doc/guix.texi | 24 +-
gnu-system.am | 2 +
gnu/packages/gnuzilla.scm | 168 +++++
gnu/packages/image.scm | 25 +-
gnu/packages/linux.scm | 4 +-
gnu/packages/ninja.scm | 87 +++
gnu/packages/patches/nss-pkgconfig.patch | 225 ++++++
gnu/packages/pdf.scm | 18 +-
gnu/packages/polkit.scm | 75 +--
gnu/packages/qt.scm | 63 ++-
guix/base64.scm | 22 +-
guix/derivations.scm | 77 ++-
guix/hash.scm | 5 +
guix/import/cpan.scm | 167 +++++
guix/import/gnu.scm | 7 +-
guix/import/json.scm | 32 +
guix/import/pypi.scm | 47 +--
guix/import/utils.scm | 48 ++-
guix/records.scm | 59 +-
guix/scripts/import.scm | 2 +-
guix/scripts/import/cpan.scm | 91 +++
guix/scripts/substitute-binary.scm | 13 +-
guix/tests.scm | 11 +
guix/ui.scm | 16 +-
po/packages/eo.po | 1107 +++++++++++++++++++++++++++---
tests/{pypi.scm => cpan.scm} | 93 ++--
tests/derivations.scm | 13 +-
tests/lint.scm | 1 +
tests/pypi.scm | 11 +-
30 files changed, 2163 insertions(+), 359 deletions(-)