[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into krb5-update
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into krb5-update |
|
Date: |
Thu, 12 Nov 2015 22:20:21 +0000 |
mhw pushed a commit to branch krb5-update
in repository guix.
commit 6bd4801faf1091643f0b1d4e50468d91ca45f613
Merge: 592c4f2 8b341eb
Author: Mark H Weaver <address@hidden>
Date: Thu Nov 12 17:20:01 2015 -0500
Merge branch 'master' into krb5-update
doc/guix.texi | 19 +-
emacs/guix-command.el | 147 +++++-
emacs/guix-utils.el | 11 +
gnu-system.am | 10 +
gnu/packages/admin.scm | 38 +-
gnu/packages/{avr.scm => aria2.scm} | 42 +-
gnu/packages/audio.scm | 6 +-
gnu/packages/avr.scm | 46 ++-
gnu/packages/bioinformatics.scm | 1 +
gnu/packages/games.scm | 542 ++++++++++++++++++++
gnu/packages/gcc.scm | 3 +
gnu/packages/glib.scm | 11 +-
gnu/packages/gnome.scm | 273 ++++++++++-
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gtk.scm | 4 +-
gnu/packages/guile.scm | 52 ++-
gnu/packages/inklingreader.scm | 59 +++
gnu/packages/linux.scm | 4 +-
gnu/packages/maths.scm | 6 +-
gnu/packages/owncloud.scm | 80 +++
gnu/packages/package-management.scm | 7 +-
.../patches/mupen64plus-ui-console-notice.patch | 34 ++
gnu/packages/patches/torsocks-dns-test.patch | 18 +
.../patches/wpa-supplicant-CVE-2015-5310.patch | 32 ++
.../patches/wpa-supplicant-CVE-2015-5314.patch | 51 ++
.../patches/wpa-supplicant-CVE-2015-5315.patch | 54 ++
.../patches/wpa-supplicant-CVE-2015-5316.patch | 34 ++
gnu/packages/qt.scm | 36 ++-
gnu/packages/ruby.scm | 25 +
gnu/packages/tor.scm | 37 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 4 +-
gnu/system.scm | 28 -
gnu/system/shadow.scm | 30 +-
guix/scripts/edit.scm | 5 +-
guix/scripts/gc.scm | 7 +
guix/scripts/package.scm | 64 ++-
guix/scripts/refresh.scm | 30 +-
guix/ui.scm | 3 +
tests/guix-gc.sh | 8 +-
tests/guix-package-net.sh | 12 +-
41 files changed, 1697 insertions(+), 186 deletions(-)