[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Wed, 25 Mar 2015 21:43:31 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 25d5b708a636ecf779035f75ad110574fc0262b9
Merge: 17287d7 614c218
Author: Ludovic Courtès <address@hidden>
Date: Wed Mar 25 10:52:52 2015 +0100
Merge branch 'master' into core-updates
.gitignore | 2 +-
Makefile.am | 4 +-
config-daemon.ac | 4 +-
configure.ac | 5 +-
daemon.am | 2 +-
doc/guix.texi | 52 ++-
gnu-system.am | 3 +
gnu/packages/algebra.scm | 17 +-
gnu/packages/audio.scm | 2 +-
gnu/packages/bioinformatics.scm | 119 ++++
gnu/packages/code.scm | 57 ++-
gnu/packages/databases.scm | 29 +-
gnu/packages/dictionaries.scm | 47 +--
gnu/packages/ebook.scm | 7 +-
gnu/packages/emacs.scm | 64 +-
gnu/packages/ghostscript.scm | 3 +-
gnu/packages/gl.scm | 144 ++++-
gnu/packages/glib.scm | 12 +-
gnu/packages/gtk.scm | 4 +-
gnu/packages/idutils.scm | 4 +-
gnu/packages/java.scm | 172 +++---
gnu/packages/julia.scm | 172 +++++
gnu/packages/linux.scm | 2 +
gnu/packages/mail.scm | 9 +-
gnu/packages/maths.scm | 118 ++++-
gnu/packages/openssl.scm | 4 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/patches/agg-am_c_prototype.patch | 14 +
.../patches/calibre-no-updates-dialog.patch | 18 +
gnu/packages/patches/mplayer2-theora-fix.patch | 286 ++++++++
gnu/packages/patchutils.scm | 32 +-
gnu/packages/perl.scm | 701 ++++++++++++++++++++
gnu/packages/python.scm | 106 ++--
gnu/packages/scheme.scm | 2 +-
gnu/packages/sdl.scm | 12 +-
gnu/packages/ssh.scm | 1 -
gnu/packages/textutils.scm | 39 ++
gnu/packages/version-control.scm | 2 +-
gnu/packages/video.scm | 131 ++++-
gnu/packages/web.scm | 595 +++++++++++++++--
gnu/packages/wxwidgets.scm | 4 +-
gnu/packages/xorg.scm | 12 +-
gnu/services/base.scm | 13 +-
guix/derivations.scm | 48 ++-
guix/ftp-client.scm | 7 +-
guix/gexp.scm | 66 ++-
guix/scripts/lint.scm | 27 +-
guix/scripts/package.scm | 39 +-
.../{substitute-binary.scm => substitute.scm} | 317 ++++++---
guix/store.scm | 11 +-
guix/tests.scm | 4 +-
guix/ui.scm | 2 +-
nix/scripts/substitute-binary.in | 11 -
nix/scripts/substitute.in | 11 +
pre-inst-env.in | 2 +-
tests/derivations.scm | 14 +
tests/gexp.scm | 23 +
tests/store.scm | 12 +-
tests/{substitute-binary.scm => substitute.scm} | 58 +-
59 files changed, 3141 insertions(+), 543 deletions(-)