[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
03/03: Merge branch 'master' into core-updates |
|
Date: |
Sun, 03 Jan 2016 13:53:34 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 53334dd6e9e296e17110ebcd2b1f93f117ffe36a
Merge: 1575dcd 5138536
Author: Ludovic Courtès <address@hidden>
Date: Sun Jan 3 14:53:03 2016 +0100
Merge branch 'master' into core-updates
NEWS | 31 +
daemon.am | 2 -
doc/emacs.texi | 72 +-
doc/guix.texi | 1506 +++++++++++++++++-
emacs.am | 11 +-
emacs/guix-backend.el | 68 +-
emacs/guix-base.el | 863 +----------
emacs/guix-buffer.el | 622 +++++++
emacs/guix-command.el | 9 +-
emacs/guix-entry.el | 59 +
emacs/guix-external.el | 8 +-
emacs/guix-hydra-build.el | 362 +++++
emacs/guix-hydra-jobset.el | 162 ++
emacs/guix-hydra.el | 363 +++++
emacs/guix-info.el | 1007 ++++--------
emacs/guix-list.el | 960 ++++--------
emacs/guix-main.scm | 4 +-
emacs/guix-messages.el | 26 +-
emacs/guix-read.el | 123 +-
emacs/guix-ui-generation.el | 433 +++++
emacs/guix-ui-package.el | 955 +++++++++++
emacs/guix-ui.el | 333 ++++
emacs/guix-utils.el | 269 +++-
emacs/guix.el | 213 ---
gnu-system.am | 7 +-
gnu/build/file-systems.scm | 61 +-
gnu/packages.scm | 61 -
gnu/packages/admin.scm | 260 ++-
gnu/packages/audio.scm | 80 +-
gnu/packages/bioinformatics.scm | 301 ++++-
gnu/packages/bittorrent.scm | 5 +-
gnu/packages/cdrom.scm | 5 +-
gnu/packages/code.scm | 32 +
gnu/packages/crypto.scm | 9 +-
gnu/packages/cups.scm | 5 +-
gnu/packages/cursynth.scm | 53 -
gnu/packages/databases.scm | 6 +-
gnu/packages/dictionaries.scm | 5 +-
gnu/packages/disk.scm | 3 +-
gnu/packages/dns.scm | 6 +-
gnu/packages/engineering.scm | 51 +
gnu/packages/enlightenment.scm | 12 +-
gnu/packages/freedesktop.scm | 174 ++-
gnu/packages/game-development.scm | 5 +-
gnu/packages/gcc.scm | 5 +-
gnu/packages/gimp.scm | 9 +-
gnu/packages/gnome.scm | 391 ++++-
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnupg.scm | 4 +-
gnu/packages/gnuzilla.scm | 11 +-
gnu/packages/graphics.scm | 16 +-
gnu/packages/grub.scm | 4 +-
gnu/packages/gtk.scm | 64 +-
gnu/packages/guile.scm | 28 +
gnu/packages/haskell.scm | 447 +++---
gnu/packages/image.scm | 4 +-
gnu/packages/irssi.scm | 3 +-
gnu/packages/java.scm | 26 +-
gnu/packages/key-mon.scm | 2 +-
gnu/packages/libevent.scm | 2 +-
gnu/packages/linux.scm | 174 ++-
gnu/packages/lynx.scm | 3 +-
gnu/packages/machine-learning.scm | 33 +
gnu/packages/mail.scm | 47 +-
gnu/packages/maths.scm | 71 +
gnu/packages/messaging.scm | 6 +-
gnu/packages/moreutils.scm | 4 +-
gnu/packages/music.scm | 260 +++-
gnu/packages/ntp.scm | 43 +
gnu/packages/ocaml.scm | 2 +-
gnu/packages/openstack.scm | 24 +-
gnu/packages/owncloud.scm | 8 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 49 +
gnu/packages/patches/bluez-tests.patch | 25 -
gnu/packages/patches/fuse-CVE-2015-3202.patch | 65 -
gnu/packages/patches/grub-CVE-2015-8370.patch | 45 +
gnu/packages/patches/icecat-freetype-2.6.patch | 14 -
.../patches/python-ipython-inputhook-ctype.patch | 41 +
gnu/packages/patchutils.scm | 14 +-
gnu/packages/perl.scm | 129 ++
gnu/packages/python.scm | 336 ++--
gnu/packages/ruby.scm | 684 ++++++++-
gnu/packages/samba.scm | 184 ++-
gnu/packages/sdl.scm | 61 +-
gnu/packages/ssh.scm | 4 +-
gnu/packages/statistics.scm | 155 ++
gnu/packages/telephony.scm | 10 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/texlive.scm | 7 +-
gnu/packages/tls.scm | 14 +-
gnu/packages/tmux.scm | 4 +-
gnu/packages/version-control.scm | 49 +-
gnu/packages/video.scm | 81 +-
gnu/packages/web.scm | 63 +-
gnu/packages/xdisorg.scm | 85 +-
gnu/packages/xiph.scm | 2 +-
gnu/packages/xml.scm | 147 ++
gnu/packages/zsh.scm | 8 +-
gnu/services/base.scm | 178 ++-
gnu/services/mail.scm | 1692 ++++++++++++++++++++
gnu/system.scm | 25 +-
gnu/system/examples/bare-bones.tmpl | 4 +-
gnu/system/examples/desktop.tmpl | 6 +-
gnu/system/file-systems.scm | 50 +-
gnu/system/vm.scm | 5 +-
guix/build-system/r.scm | 9 +-
guix/gexp.scm | 66 +-
guix/http-client.scm | 15 +-
guix/import/cran.scm | 9 +-
guix/licenses.scm | 7 +-
guix/packages.scm | 12 +
guix/profiles.scm | 4 +-
guix/scripts/build.scm | 17 +-
guix/scripts/graph.scm | 8 +-
guix/scripts/lint.scm | 1 +
guix/scripts/package.scm | 2 +-
nix/libstore/build.cc | 97 +-
nix/libstore/remote-store.cc | 639 --------
nix/libstore/remote-store.hh | 106 --
nix/libstore/store-api.cc | 22 +-
nix/libstore/store-api.hh | 24 +
nix/nix-daemon/guix-daemon.cc | 15 +
tests/graph.scm | 35 +-
tests/guix-package.sh | 4 +
tests/guix-system.sh | 32 +-
tests/packages.scm | 21 +
tests/profiles.scm | 9 +
128 files changed, 12007 insertions(+), 4688 deletions(-)
diff --cc gnu-system.am
index ce7b908,24f7516..8bace7d
--- a/gnu-system.am
+++ b/gnu-system.am
@@@ -498,7 -494,8 +496,8 @@@ dist_patch_DATA =
gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
gnu/packages/patches/gobject-introspection-cc.patch \
gnu/packages/patches/gobject-introspection-girepository.patch \
- gnu/packages/patches/grep-CVE-2015-1345.patch \
+ gnu/packages/patches/grep-timing-sensitive-test.patch \
+ gnu/packages/patches/grub-CVE-2015-8370.patch \
gnu/packages/patches/grub-gets-undeclared.patch \
gnu/packages/patches/grub-freetype.patch \
gnu/packages/patches/guile-1.8-cpp-4.5.patch \