[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: Merge branch 'master' into core-updates
From: |
Leo Famulari |
Subject: |
02/05: Merge branch 'master' into core-updates |
Date: |
Thu, 18 Aug 2016 03:39:44 +0000 (UTC) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 015ee84aac888b3900fa0ee54a1b7e55c083e7d3
Merge: a3d6e1f 79f9d5d
Author: Leo Famulari <address@hidden>
Date: Wed Aug 17 23:21:00 2016 -0400
Merge branch 'master' into core-updates
gnu/local.mk | 9 +-
gnu/packages/admin.scm | 38 +-
gnu/packages/adns.scm | 4 +-
gnu/packages/audio.scm | 13 +-
gnu/packages/avr.scm | 37 +-
gnu/packages/benchmark.scm | 63 +
gnu/packages/bioinformatics.scm | 246 +++-
gnu/packages/databases.scm | 8 +-
gnu/packages/debug.scm | 60 +
gnu/packages/dico.scm | 14 +-
gnu/packages/emacs.scm | 19 +
gnu/packages/freeipmi.scm | 7 +-
gnu/packages/games.scm | 42 +
gnu/packages/gnome.scm | 19 +-
gnu/packages/gnunet.scm | 48 +-
gnu/packages/gnupg.scm | 44 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 25 +
gnu/packages/java.scm | 141 ++
gnu/packages/kde-frameworks.scm | 923 ++++++++++++-
gnu/packages/linux.scm | 12 +-
gnu/packages/lirc.scm | 51 +
gnu/packages/mail.scm | 85 +-
gnu/packages/musl.scm | 50 +
gnu/packages/networking.scm | 92 +-
gnu/packages/package-management.scm | 4 +-
gnu/packages/password-utils.scm | 2 +
gnu/packages/patches/cracklib-CVE-2016-6318.patch | 95 ++
gnu/packages/patches/dico-idxgcide-bug.patch | 21 -
.../patches/dico-libtool-deterministic.patch | 15 -
gnu/packages/patches/jq-CVE-2015-8863.patch | 45 +
gnu/packages/patches/laby-make-install.patch | 25 +
gnu/packages/patches/netsurf-about.patch | 26 +
gnu/packages/pdf.scm | 34 +
gnu/packages/pulseaudio.scm | 4 +-
gnu/packages/python.scm | 153 ++-
gnu/packages/qemu.scm | 306 ++++-
gnu/packages/rdf.scm | 10 +-
gnu/packages/scsi.scm | 54 +
gnu/packages/shells.scm | 42 +-
gnu/packages/spice.scm | 72 +-
gnu/packages/ssh.scm | 66 +-
gnu/packages/suckless.scm | 82 +-
gnu/packages/version-control.scm | 77 +-
gnu/packages/video.scm | 38 +-
gnu/packages/web.scm | 126 +-
gnu/packages/xml.scm | 33 +
gnu/services/base.scm | 7 +-
guix/build-system/ant.scm | 2 +-
guix/profiles.scm | 14 +-
po/guix/pl.po | 1368 +++++++++++++-------
51 files changed, 3844 insertions(+), 931 deletions(-)
diff --cc gnu/packages/pdf.scm
index 4757ef7,59e5523..3c267fb
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -5,7 -5,7 +5,8 @@@
;;; Copyright © 2015 Paul van der Walt <address@hidden>
;;; Copyright © 2016 Roel Janssen <address@hidden>
;;; Coypright © 2016 ng0 <address@hidden>
+;;; Coypright © 2016 Efraim Flashner <address@hidden>
+ ;;; Coypright © 2016 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;