[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
From: |
Leo Famulari |
Subject: |
01/02: Merge branch 'master' into core-updates |
Date: |
Wed, 24 May 2017 18:23:19 -0400 (EDT) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 38f1163c955945e92ba4d48c6f7c233c7a2aac1f
Merge: 9269ce4 ff51a87
Author: Leo Famulari <address@hidden>
Date: Wed May 24 18:02:27 2017 -0400
Merge branch 'master' into core-updates
gnu/local.mk | 3 +-
gnu/packages/audio.scm | 7 +++-
gnu/packages/gnome.scm | 39 ++++++++---------
gnu/packages/logging.scm | 12 +++---
gnu/packages/music.scm | 10 +++--
gnu/packages/patches/libtasn1-CVE-2017-6891.patch | 51 +++++++++++++++++++++++
gnu/packages/python.scm | 20 ++++-----
gnu/packages/samba.scm | 4 +-
gnu/packages/scanner.scm | 51 ++++++++++++-----------
gnu/packages/tls.scm | 14 ++++++-
gnu/packages/xdisorg.scm | 8 ++--
guix/scripts/publish.scm | 12 +++---
12 files changed, 151 insertions(+), 80 deletions(-)