[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/04: Merge branch 'master' into core-updates |
|
Date: |
Fri, 30 Jun 2017 02:43:21 -0400 (EDT) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 1024c8119c71ba3ec0122238e8d8254b08d29187
Merge: 92cb946 95bbaa0
Author: Leo Famulari <address@hidden>
Date: Thu Jun 29 18:02:17 2017 -0400
Merge branch 'master' into core-updates
gnu/local.mk | 4 +-
gnu/packages/admin.scm | 6 +-
gnu/packages/astronomy.scm | 14 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/emacs.scm | 53 ++-
gnu/packages/firmware.scm | 23 +-
gnu/packages/game-development.scm | 2 +-
gnu/packages/gnome.scm | 8 +-
gnu/packages/gnupg.scm | 15 +
gnu/packages/gnuzilla.scm | 11 +-
gnu/packages/hexedit.scm | 27 ++
gnu/packages/java.scm | 4 +-
gnu/packages/kde-frameworks.scm | 389 +++++++++++++++++++++
gnu/packages/linux.scm | 88 ++---
gnu/packages/lirc.scm | 7 +
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 19 +-
gnu/packages/mes.scm | 56 ++-
gnu/packages/moe.scm | 6 +-
gnu/packages/mp3.scm | 4 +-
gnu/packages/networking.scm | 79 +++++
gnu/packages/node.scm | 14 +-
.../patches/ansible-wrap-program-hack.patch | 22 ++
.../patches/quagga-reproducible-build.patch | 22 ++
.../patches/screen-fix-info-syntax-error.patch | 47 ---
gnu/packages/pdf.scm | 17 +-
gnu/packages/photo.scm | 2 +
gnu/packages/python.scm | 14 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/screen.scm | 7 +-
gnu/packages/statistics.scm | 27 +-
gnu/packages/tex.scm | 147 +++++++-
gnu/packages/video.scm | 3 +-
gnu/packages/wdiff.scm | 23 +-
gnu/packages/wine.scm | 7 +-
gnu/packages/xfce.scm | 24 +-
gnu/packages/xorg.scm | 5 +-
gnu/system.scm | 1 +
guix/import/cran.scm | 2 +-
guix/profiles.scm | 7 +
guix/scripts/package.scm | 16 +-
tests/guix-package.sh | 19 +
tests/profiles.scm | 7 +
44 files changed, 1033 insertions(+), 231 deletions(-)
diff --cc gnu/packages/gnupg.scm
index d4d52ee,e42afba..8b6069e
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -82,7 -82,8 +82,8 @@@ Daemon and possibly more in the future.
(define-public libgcrypt
(package
(name "libgcrypt")
+ (replacement libgcrypt-1.7.8)
- (version "1.7.6")
+ (version "1.7.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"