[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into 'core-updates'.
|
From: |
Ludovic Courtès |
|
Subject: |
02/02: Merge branch 'master' into 'core-updates'. |
|
Date: |
Sun, 14 Dec 2014 10:57:49 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit c4a1b6c2ba479c6abcd22cab6a1fcd560469e986
Merge: 2ed11b3 45c5b47
Author: Ludovic Courtès <address@hidden>
Date: Sun Dec 14 11:55:07 2014 +0100
Merge branch 'master' into 'core-updates'.
.dir-locals.el | 2 +
.gitignore | 1 +
AUTHORS | 1 +
Makefile.am | 8 +
THANKS | 2 +
build-aux/hydra/demo-os.scm | 2 +-
configure.ac | 3 +-
doc/emacs.texi | 20 +-
doc/guix.texi | 349 +++++-
emacs.am | 4 +-
emacs/guix-backend.el | 4 +-
emacs/guix-base.el | 42 +-
emacs/guix-emacs.el | 79 ++
emacs/guix-helper.scm.in | 1 +
emacs/guix-init.el.in | 19 +-
emacs/guix-main.scm | 2 +
emacs/guix-profiles.el.in | 62 +
gnu-system.am | 22 +-
gnu/build/activation.scm | 30 +-
gnu/build/install.scm | 10 +-
gnu/build/linux-boot.scm | 43 +-
gnu/build/linux-modules.scm | 166 +++
gnu/build/vm.scm | 9 +
gnu/packages/admin.scm | 13 +-
gnu/packages/base.scm | 7 +-
gnu/packages/bioinformatics.scm | 84 ++
gnu/packages/bittorrent.scm | 73 ++-
gnu/packages/cdrom.scm | 111 ++-
gnu/packages/debug.scm | 139 +++
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/dwm.scm | 55 +
gnu/packages/emacs.scm | 204 ++++-
gnu/packages/fish.scm | 12 +-
gnu/packages/fonts.scm | 82 ++-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/games.scm | 3 +-
gnu/packages/gimp.scm | 5 +-
gnu/packages/gl.scm | 3 +-
gnu/packages/glib.scm | 116 ++-
gnu/packages/global.scm | 4 +-
gnu/packages/gnome.scm | 48 +-
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnupg.scm | 8 +-
gnu/packages/gnutls.scm | 4 +-
gnu/packages/gsasl.scm | 4 +-
gnu/packages/gtk.scm | 117 ++-
gnu/packages/linux-libre-i686.conf | 170 ++-
gnu/packages/linux-libre-x86_64.conf | 172 ++-
gnu/packages/linux.scm | 12 +-
gnu/packages/lisp.scm | 9 +-
gnu/packages/llvm.scm | 107 ++
gnu/packages/mail.scm | 165 +++-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 9 +
gnu/packages/mg.scm | 64 +
gnu/packages/mp3.scm | 92 ++-
gnu/packages/nutrition.scm | 68 ++
gnu/packages/ocrad.scm | 4 +-
gnu/packages/package-management.scm | 4 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/patches/glib-tests-gapplication.patch | 28 +
gnu/packages/patches/guile-linux-syscalls.patch | 9 +-
.../patches/python-sqlite-3.8.4-test-fix.patch | 15 +
...on2-pygobject-2-gi-info-type-error-domain.patch | 39 +
.../patches/python2-sqlite-3.8.4-test-fix.patch | 15 +
gnu/packages/patches/wmctrl-64-fix.patch | 32 +
.../patches/xf86-video-openchrome-includes.patch | 35 +
gnu/packages/pcre.scm | 8 +-
gnu/packages/perl.scm | 203 ++++
gnu/packages/pkg-config.scm | 20 +-
gnu/packages/pretty-print.scm | 41 +
gnu/packages/python.scm | 675 +++++++++++-
gnu/packages/qemu.scm | 2 +-
gnu/packages/qt.scm | 17 +-
gnu/packages/scrot.scm | 68 --
gnu/packages/socat.scm | 55 +
gnu/packages/telephony.scm | 12 +-
gnu/packages/texlive.scm | 1 +
gnu/packages/{parallel.scm => tre.scm} | 44 +-
gnu/packages/unclutter.scm | 69 --
gnu/packages/version-control.scm | 184 +++-
gnu/packages/video.scm | 4 +-
gnu/packages/web.scm | 65 +
gnu/packages/wget.scm | 4 +-
gnu/packages/xdisorg.scm | 341 ++++++
gnu/packages/xfce.scm | 478 ++++++++
gnu/packages/xfig.scm | 10 +-
gnu/packages/xorg.scm | 147 +---
gnu/packages/yubico.scm | 76 ++
gnu/services/ssh.scm | 9 +-
gnu/services/xorg.scm | 30 +-
gnu/system.scm | 61 +-
gnu/system/file-systems.scm | 8 +-
gnu/system/grub.scm | 19 +-
gnu/system/install.scm | 7 +-
gnu/system/linux-initrd.scm | 63 +-
gnu/system/locale.scm | 126 ++
gnu/system/shadow.scm | 17 +-
gnu/system/vm.scm | 4 +-
guix/build-system/glib-or-gtk.scm | 3 +
guix/build-system/python.scm | 2 +
guix/build/emacs-utils.scm | 10 +
guix/build/glib-or-gtk-build-system.scm | 99 +-
guix/derivations.scm | 1 +
guix/download.scm | 24 +-
guix/elf.scm | 1045 ++++++++++++++++
guix/gnu-maintenance.scm | 8 +-
guix/import/gnu.scm | 2 +-
guix/licenses.scm | 13 +-
guix/monads.scm | 33 +-
guix/packages.scm | 2 +-
guix/scripts/archive.scm | 5 +
guix/scripts/build.scm | 20 +-
guix/scripts/environment.scm | 6 +
guix/scripts/package.scm | 5 +
guix/scripts/substitute-binary.scm | 6 +-
guix/scripts/system.scm | 58 +-
guix/store.scm | 4 +-
guix/ui.scm | 5 +
guix/utils.scm | 10 +
nix/nix-daemon/guix-daemon.cc | 3 +
po/guix/POTFILES.in | 1 +
po/guix/eo.po | 606 ++++++----
po/guix/hu.po | 603 ++++++----
po/packages/LINGUAS | 1 +
po/packages/hu.po | 1262 ++++++++++++++++++++
test-env.in | 4 +-
tests/guix-build.sh | 10 +
tests/guix-package.sh | 13 +
130 files changed, 8513 insertions(+), 1265 deletions(-)