[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into dbus-update
|
From: |
??? |
|
Subject: |
02/02: Merge branch 'master' into dbus-update |
|
Date: |
Fri, 30 Oct 2015 12:51:18 +0000 |
iyzsong pushed a commit to branch dbus-update
in repository guix.
commit eed588d9976367cac020d20de9a99d4bce0058b3
Merge: 9fa8f43 b90e7e5
Author: 宋文武 <address@hidden>
Date: Fri Oct 30 20:50:26 2015 +0800
Merge branch 'master' into dbus-update
.dir-locals.el | 1 +
Makefile.am | 1 +
doc/contributing.texi | 25 ++
doc/emacs.texi | 2 +
doc/guix.texi | 246 +++++++++++++-
emacs/guix-base.el | 2 +-
emacs/guix-command.el | 5 +-
emacs/guix-devel.el | 2 +
emacs/guix-pcomplete.el | 4 +-
gnu-system.am | 2 +-
gnu/build/linux-container.scm | 2 +-
gnu/packages/algebra.scm | 2 +
gnu/packages/avahi.scm | 2 +-
gnu/packages/backup.scm | 45 +++
gnu/packages/bioinformatics.scm | 81 +++--
gnu/packages/cyrus-sasl.scm | 4 +-
gnu/packages/databases.scm | 22 ++
gnu/packages/emacs.scm | 8 +-
gnu/packages/fish.scm | 4 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/gcc.scm | 10 +-
gnu/packages/gdbm.scm | 46 ---
gnu/packages/grub.scm | 32 ++-
gnu/packages/guile.scm | 8 +-
gnu/packages/haskell.scm | 61 +---
gnu/packages/java.scm | 18 +-
gnu/packages/linux.scm | 8 +-
gnu/packages/mail.scm | 2 -
gnu/packages/man.scm | 2 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/package-management.scm | 137 ++++++++-
gnu/packages/password-utils.scm | 32 ++
.../patches/xfce4-session-fix-xflock4.patch | 31 ++
gnu/packages/pcre.scm | 35 ++
gnu/packages/pulseaudio.scm | 2 +-
gnu/packages/python.scm | 97 ++++++-
gnu/packages/ruby.scm | 3 +-
gnu/packages/sawfish.scm | 2 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/video.scm | 172 ++++++-----
gnu/packages/xfce.scm | 5 +-
gnu/packages/xorg.scm | 42 +++
gnu/services.scm | 101 +++++--
gnu/services/base.scm | 22 ++-
gnu/services/desktop.scm | 6 +
gnu/services/xorg.scm | 55 +++-
gnu/system.scm | 26 +-
gnu/system/file-systems.scm | 5 +-
gnu/system/grub.scm | 57 +++--
gnu/system/linux-initrd.scm | 6 +-
gnu/system/linux.scm | 3 +-
guix/build/haskell-build-system.scm | 9 +
guix/gnu-maintenance.scm | 8 +-
guix/import/cran.scm | 8 +-
guix/import/elpa.scm | 8 +-
guix/profiles.scm | 80 +++++-
guix/scripts/build.scm | 50 ++--
guix/scripts/challenge.scm | 6 +-
guix/scripts/environment.scm | 337 ++++++++++++++++----
guix/scripts/package.scm | 208 +------------
guix/scripts/pull.scm | 1 +
guix/scripts/refresh.scm | 32 ++-
guix/scripts/size.scm | 3 +-
guix/scripts/substitute.scm | 113 ++++---
guix/scripts/system.scm | 248 ++++++++++-----
guix/store.scm | 15 +-
guix/ui.scm | 157 +++++++++-
guix/upstream.scm | 15 +-
guix/utils.scm | 36 ++
po/guix/POTFILES.in | 2 +
tests/guix-build.sh | 27 ++
tests/guix-environment-container.sh | 76 +++++
tests/guix-environment.sh | 14 +
tests/substitute.scm | 4 +-
74 files changed, 2144 insertions(+), 811 deletions(-)