[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, 19 Jul 2015 22:12:48 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f
Merge: aa27987 50c7a1e
Author: Mark H Weaver <address@hidden>
Date: Sun Jul 19 18:12:34 2015 -0400
Merge branch 'master' into core-updates
.gitignore | 1 +
AUTHORS | 44 +-
Makefile.am | 10 +-
daemon.am | 17 +-
doc.am | 17 +-
doc/guix.texi | 31 +-
etc/guix-daemon.service.in | 15 +
gnu-system.am | 2 +
gnu/packages/admin.scm | 4 +-
gnu/packages/algebra.scm | 2 +-
gnu/packages/audio.scm | 2 +-
gnu/packages/backup.scm | 12 +-
gnu/packages/base.scm | 2 +-
gnu/packages/bioinformatics.scm | 79 ++
gnu/packages/bittorrent.scm | 2 +-
gnu/packages/code.scm | 2 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/curl.scm | 10 +-
gnu/packages/databases.scm | 10 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/emacs.scm | 99 ++-
gnu/packages/enchant.scm | 2 +-
gnu/packages/firmware.scm | 2 +-
gnu/packages/flashing-tools.scm | 11 +-
gnu/packages/fonts.scm | 3 +-
gnu/packages/freedesktop.scm | 32 +-
gnu/packages/games.scm | 17 +-
gnu/packages/gcc.scm | 52 +-
gnu/packages/gd.scm | 2 +-
gnu/packages/gl.scm | 39 +-
gnu/packages/gnome.scm | 96 ++-
gnu/packages/gsasl.scm | 2 +-
gnu/packages/gstreamer.scm | 9 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/haskell.scm | 8 +-
gnu/packages/image.scm | 8 +-
gnu/packages/language.scm | 4 +-
gnu/packages/lesstif.scm | 2 +-
gnu/packages/libreoffice.scm | 2 +-
gnu/packages/linux.scm | 126 +++-
gnu/packages/llvm.scm | 12 +-
gnu/packages/lxde.scm | 49 +
gnu/packages/maths.scm | 12 +-
gnu/packages/mcrypt.scm | 2 +-
gnu/packages/mit-krb5.scm | 5 +-
gnu/packages/mp3.scm | 14 +-
gnu/packages/ncdu.scm | 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/ntp.scm | 4 +-
gnu/packages/ocaml.scm | 4 +-
gnu/packages/openbox.scm | 2 +-
gnu/packages/patches/crda-optional-gcrypt.patch | 20 +
gnu/packages/pdf.scm | 6 +-
gnu/packages/perl.scm | 76 +-
gnu/packages/pretty-print.scm | 2 +-
gnu/packages/pulseaudio.scm | 13 +-
gnu/packages/python.scm | 15 +-
gnu/packages/rdesktop.scm | 2 +-
gnu/packages/rdf.scm | 2 +-
gnu/packages/ruby.scm | 4 +-
gnu/packages/slang.scm | 6 +-
gnu/packages/slim.scm | 2 +-
gnu/packages/telephony.scm | 24 +-
gnu/packages/tls.scm | 2 +-
gnu/packages/tmux.scm | 2 +-
gnu/packages/tre.scm | 4 +-
gnu/packages/unrtf.scm | 2 +-
gnu/packages/version-control.scm | 10 +-
gnu/packages/video.scm | 4 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/web.scm | 26 +-
gnu/packages/wget.scm | 2 +-
gnu/packages/wordnet.scm | 6 +-
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xfce.scm | 4 +-
gnu/packages/xiph.scm | 10 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 1116 +++++++++++++++--------
gnu/services/base.scm | 12 +-
gnu/system.scm | 30 +-
gnu/system/file-systems.scm | 47 +-
gnu/system/install.scm | 6 +-
gnu/system/shadow.scm | 2 +-
gnu/system/vm.scm | 3 +-
guix/build-system/ruby.scm | 2 +
guix/build/download.scm | 3 +-
guix/build/ruby-build-system.scm | 12 +-
guix/build/syscalls.scm | 32 +-
guix/licenses.scm | 6 +
guix/scripts/package.scm | 16 -
guix/scripts/publish.scm | 2 +-
guix/scripts/size.scm | 21 +-
guix/scripts/system.scm | 11 +-
guix/ui.scm | 17 +
po/packages/POTFILES.in | 4 +
tests/file-systems.scm | 10 +
tests/publish.scm | 2 +-
98 files changed, 1738 insertions(+), 768 deletions(-)