[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
02/02: Merge branch 'master' into core-updates |
|
Date: |
Thu, 30 Mar 2017 17:05:38 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 84157bb8bf2c610584e0836047da4c710f8eaf76
Merge: fa63939 03d0aa8
Author: Marius Bakke <address@hidden>
Date: Thu Mar 30 22:59:53 2017 +0200
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
build-aux/hydra/gnu-system.scm | 1 +
gnu/local.mk | 8 +
gnu/packages/admin.scm | 37 +--
gnu/packages/adns.scm | 2 +-
gnu/packages/aidc.scm | 2 +-
gnu/packages/algebra.scm | 2 +-
gnu/packages/assembly.scm | 2 +-
gnu/packages/astronomy.scm | 2 +-
gnu/packages/autotools.scm | 6 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/base.scm | 24 +-
gnu/packages/bash.scm | 2 +-
gnu/packages/benchmark.scm | 33 +-
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/bison.scm | 2 +-
gnu/packages/calendar.scm | 2 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/code.scm | 6 +-
gnu/packages/commencement.scm | 2 +-
gnu/packages/compression.scm | 12 +-
gnu/packages/cppi.scm | 2 +-
gnu/packages/databases.scm | 8 +-
gnu/packages/dico.scm | 2 +-
gnu/packages/dictionaries.scm | 2 +-
gnu/packages/elf.scm | 12 +-
gnu/packages/emacs.scm | 111 ++++++-
gnu/packages/file-systems.scm | 88 ++++++
gnu/packages/fonts.scm | 2 +-
gnu/packages/freedesktop.scm | 8 +-
gnu/packages/games.scm | 333 +++++++++++---------
gnu/packages/gawk.scm | 2 +-
gnu/packages/gcal.scm | 2 +-
gnu/packages/gcc.scm | 4 +-
gnu/packages/gettext.scm | 2 +-
gnu/packages/ghostscript.scm | 4 +-
gnu/packages/gnu-doc.scm | 2 +-
gnu/packages/gnu-pw-mgr.scm | 2 +-
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnuzilla.scm | 30 +-
gnu/packages/gperf.scm | 2 +-
gnu/packages/groff.scm | 2 +-
gnu/packages/gsasl.scm | 4 +-
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile.scm | 21 +-
gnu/packages/gv.scm | 2 +-
gnu/packages/gxmessage.scm | 2 +-
gnu/packages/hurd.scm | 6 +-
gnu/packages/idutils.scm | 2 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/indent.scm | 2 +-
gnu/packages/kerberos.scm | 2 +-
gnu/packages/kodi.scm | 31 +-
gnu/packages/libidn.scm | 2 +-
gnu/packages/libsigsegv.scm | 2 +-
gnu/packages/linux.scm | 151 ++++++++-
gnu/packages/lisp.scm | 21 +-
gnu/packages/lxde.scm | 242 +++++++++++++++
gnu/packages/m4.scm | 2 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/make-bootstrap.scm | 2 +-
gnu/packages/man.scm | 2 +-
gnu/packages/marst.scm | 2 +-
gnu/packages/maths.scm | 14 +-
gnu/packages/messaging.scm | 2 +-
gnu/packages/music.scm | 33 +-
gnu/packages/ncurses.scm | 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/ocr.scm | 2 +-
gnu/packages/package-management.scm | 8 +-
gnu/packages/password-utils.scm | 4 +-
.../patches/ceph-disable-cpu-optimizations.patch | 46 +++
.../patches/ceph-skip-collect-sys-info-test.patch | 29 ++
.../patches/ceph-skip-unittest_blockdev.patch | 28 ++
.../patches/lxsession-use-gapplication.patch | 152 +++++++++
gnu/packages/patches/thefuck-test-environ.patch | 14 +
gnu/packages/pem.scm | 2 +-
gnu/packages/popt.scm | 2 +-
gnu/packages/pretty-print.scm | 8 +-
gnu/packages/pth.scm | 2 +-
gnu/packages/python.scm | 108 ++++++-
gnu/packages/readline.scm | 2 +-
gnu/packages/rush.scm | 2 +-
gnu/packages/scheme.scm | 2 +-
gnu/packages/sdl.scm | 2 +-
gnu/packages/search.scm | 2 +-
gnu/packages/serveez.scm | 2 +-
gnu/packages/statistics.scm | 2 +-
gnu/packages/storage.scm | 345 +++++++++++++++++++++
gnu/packages/telephony.scm | 10 +-
gnu/packages/tex.scm | 2 +-
gnu/packages/texinfo.scm | 2 +-
gnu/packages/time.scm | 2 +-
gnu/packages/tls.scm | 10 +-
gnu/packages/unrtf.scm | 2 +-
gnu/packages/uucp.scm | 2 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/web.scm | 4 +-
gnu/packages/wm.scm | 29 ++
gnu/packages/xml.scm | 10 +
gnu/packages/xnee.scm | 2 +-
gnu/packages/xorg.scm | 10 +-
guix/build/download.scm | 6 +-
guix/derivations.scm | 11 +-
guix/import/cran.scm | 50 ++-
guix/import/elpa.scm | 2 +-
guix/scripts/import/cran.scm | 6 +-
tests/derivations.scm | 29 ++
108 files changed, 1875 insertions(+), 418 deletions(-)
diff --cc gnu/local.mk
index 44462e4,b143778..69e4b99
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -9,8 -9,7 +9,9 @@@
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira
<https://libreplanet.org/wiki/User:Adfeno> <address@hidden>
# Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
# Copyright © 2016 Ben Woodcroft <address@hidden>
+# Copyright © 2016, 2017 Alex Vong <address@hidden>
+# Copyright © 2016, 2017 Efraim Flashner <address@hidden>
+ # Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
# Copyright © 2017 Clément Lassieur <address@hidden>
# Copyright © 2017 Mathieu Othacehe <address@hidden>
#
diff --cc gnu/packages/elf.scm
index c68604c,c1f8fa3..8180f55
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@@ -2,7 -2,7 +2,8 @@@
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Andreas Enge <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2017 Leo Famulari <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gperf.scm
index a9f958f,de596e9..e20c6bd
--- a/gnu/packages/gperf.scm
+++ b/gnu/packages/gperf.scm
@@@ -33,10 -33,10 +33,10 @@@
version ".tar.gz"))
(sha256
(base32
- "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn"))))
+ "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq"))))
(build-system gnu-build-system)
(arguments '(#:parallel-tests? #f))
- (home-page "http://www.gnu.org/software/gperf/";)
+ (home-page "https://www.gnu.org/software/gperf/";)
(synopsis "Perfect hash function generator")
(description
"gperf is a perfect hash function generator. For a given list of
diff --cc gnu/packages/linux.scm
index 87483f7,eef934e..d2dbed4
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -15,9 -15,8 +15,9 @@@
;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2016 John Darrington <address@hidden>
- ;;; Copyright © 2016 Marius Bakke <address@hidden>
+ ;;; Copyright © 2016, 2017 Marius Bakke <address@hidden>
;;; Copyright © 2016 Rene Saavedra <address@hidden>
+;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
;;; Copyright © 2016 ng0 <address@hidden>
;;; Copyright © 2017 Leo Famulari <address@hidden>
;;; Copyright © 2017 José Miguel Sánchez García <address@hidden>
diff --cc gnu/packages/pth.scm
index ed6637b,5b8edc6..1908ce7
--- a/gnu/packages/pth.scm
+++ b/gnu/packages/pth.scm
@@@ -38,13 -37,8 +38,13 @@@
"0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"))))
(build-system gnu-build-system)
(arguments
- '(#:parallel-build? #f))
+ `(#:parallel-build? #f
+ #:configure-flags (list
+ ,@(if (string=? "aarch64-linux"
+ (%current-system))
+ '("--host=aarch64-unknown-linux-gnu")
+ '()))))
- (home-page "https://www.gnu.org/software/pth";)
+ (home-page "https://www.gnu.org/software/pth/";)
(synopsis "Portable thread library")
(description
"GNU Pth is a portable library providing non-preemptive, priority-based
diff --cc gnu/packages/tls.scm
index 2aecc5f,7bc0e95..5f06140
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -60,10 -60,10 +60,10 @@@
version ".tar.gz"))
(sha256
(base32
- "0869cp6jx7cajgv6cnddsh3vc7bimmdkdjn80y1jpb4iss7plvsg"))))
+ "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl)))
- (home-page "http://www.gnu.org/software/libtasn1/";)
+ (home-page "https://www.gnu.org/software/libtasn1/";)
(synopsis "ASN.1 library")
(description
"GNU libtasn1 is a library implementing the ASN.1 notation. It is used
diff --cc gnu/packages/version-control.scm
index a024d51,6d8fb2d..6d94170
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -806,11 -805,10 +806,11 @@@ projects, from individuals to large-sca
version ".tar.xz"))
(sha256
(base32
- "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86"))))
+ "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86"))
+ (patches (search-patches "rcs-5.9.4-noreturn.patch"))))
(build-system gnu-build-system)
(native-inputs `(("ed" ,ed)))
- (home-page "http://www.gnu.org/software/rcs/";)
+ (home-page "https://www.gnu.org/software/rcs/";)
(synopsis "Per-file local revision control system")
(description
"RCS is the original Revision Control System. It works on a