[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
05/05: Merge branch 'master' into core-updates |
|
Date: |
Tue, 20 Mar 2018 14:23:29 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit ac21be848ac420d2106d4441e9e48ea6a60c5c8c
Merge: d3da21d 4a78fd4
Author: Mark H Weaver <address@hidden>
Date: Tue Mar 20 14:22:06 2018 -0400
Merge branch 'master' into core-updates
.mailmap | 25 +--
Makefile.am | 2 +-
doc/guix.texi | 2 +-
etc/completion/fish/guix.fish | 2 +-
gnu/local.mk | 4 +-
gnu/packages/accessibility.scm | 2 +-
gnu/packages/admin.scm | 2 +-
gnu/packages/audio.scm | 2 +-
gnu/packages/autotools.scm | 2 +-
gnu/packages/base.scm | 55 ++++++-
gnu/packages/bioinformatics.scm | 11 +-
gnu/packages/build-tools.scm | 22 +--
gnu/packages/calendar.scm | 26 ++-
gnu/packages/cdrom.scm | 2 +-
gnu/packages/certs.scm | 15 +-
gnu/packages/check.scm | 2 +-
gnu/packages/cinnamon.scm | 2 +-
gnu/packages/compression.scm | 2 +-
gnu/packages/cran.scm | 28 ++++
gnu/packages/crypto.scm | 2 +-
gnu/packages/databases.scm | 2 +-
gnu/packages/django.scm | 2 +-
gnu/packages/dns.scm | 2 +-
gnu/packages/elf.scm | 19 ++-
gnu/packages/emacs.scm | 2 +-
gnu/packages/enlightenment.scm | 2 +-
gnu/packages/fonts.scm | 2 +-
gnu/packages/fontutils.scm | 2 +-
gnu/packages/forth.scm | 2 +-
gnu/packages/freedesktop.scm | 50 +++---
gnu/packages/fvwm.scm | 2 +-
gnu/packages/games.scm | 72 +++++----
gnu/packages/gl.scm | 16 +-
gnu/packages/gnome.scm | 60 ++++---
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnupg.scm | 2 +-
gnu/packages/gnuzilla.scm | 16 +-
gnu/packages/gtk.scm | 13 +-
gnu/packages/guile-wm.scm | 2 +-
gnu/packages/guile.scm | 2 +-
gnu/packages/haskell-check.scm | 2 +-
gnu/packages/haskell-crypto.scm | 2 +-
gnu/packages/haskell.scm | 2 +-
gnu/packages/image-viewers.scm | 2 +-
gnu/packages/image.scm | 6 +-
gnu/packages/irc.scm | 2 +-
gnu/packages/language.scm | 2 +-
gnu/packages/libcanberra.scm | 2 +-
gnu/packages/linux.scm | 18 +--
gnu/packages/lisp.scm | 2 +-
gnu/packages/lolcode.scm | 2 +-
gnu/packages/lxde.scm | 2 +-
gnu/packages/lxqt.scm | 2 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/markup.scm | 2 +-
gnu/packages/mate.scm | 2 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/mc.scm | 2 +-
gnu/packages/messaging.scm | 2 +-
gnu/packages/music.scm | 2 +-
gnu/packages/ncurses.scm | 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/nickle.scm | 2 +-
gnu/packages/ninja.scm | 2 +
gnu/packages/openbox.scm | 2 +-
.../patches/giflib-make-reallocarray-private.patch | 120 ++++++++++++++
.../patches/gnome-todo-libical-compat.patch | 17 ++
gnu/packages/patches/gtk2-fix-failing-test.patch | 39 -----
.../patches/json-glib-fix-tests-32bit.patch | 174 +++++++++++++++++++++
gnu/packages/pciutils.scm | 5 +-
gnu/packages/pdf.scm | 2 +-
gnu/packages/perl-check.scm | 2 +-
gnu/packages/perl.scm | 2 +-
gnu/packages/python-crypto.scm | 2 +-
gnu/packages/python-web.scm | 2 +-
gnu/packages/python.scm | 16 +-
gnu/packages/qt.scm | 2 +-
gnu/packages/ruby.scm | 6 +-
gnu/packages/rust.scm | 2 +-
gnu/packages/scheme.scm | 2 +-
gnu/packages/serialization.scm | 2 +-
gnu/packages/shells.scm | 2 +-
gnu/packages/ssh.scm | 2 +-
gnu/packages/suckless.scm | 2 +-
gnu/packages/tbb.scm | 2 +-
gnu/packages/telephony.scm | 2 +-
gnu/packages/text-editors.scm | 2 +-
gnu/packages/textutils.scm | 2 +-
gnu/packages/time.scm | 2 +-
gnu/packages/tls.scm | 2 +-
gnu/packages/tor.scm | 2 +-
gnu/packages/version-control.scm | 2 +-
gnu/packages/video.scm | 6 +-
gnu/packages/vim.scm | 2 +-
gnu/packages/web.scm | 9 +-
gnu/packages/wm.scm | 2 +-
gnu/packages/xdisorg.scm | 14 +-
gnu/packages/xfce.scm | 2 +-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xml.scm | 2 +-
gnu/packages/xorg.scm | 14 +-
gnu/services/certbot.scm | 2 +-
gnu/services/desktop.scm | 2 +-
gnu/services/version-control.scm | 2 +-
gnu/services/web.scm | 2 +-
guix/build-system/meson.scm | 18 ++-
guix/build/meson-build-system.scm | 9 ++
guix/import/hackage.scm | 2 +-
guix/licenses.scm | 2 +-
109 files changed, 737 insertions(+), 326 deletions(-)
diff --cc gnu/packages/autotools.scm
index b86c1c8,fd307a1..913caa2
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@@ -3,12 -3,11 +3,12 @@@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
;;; Copyright © 2015 Mathieu Lirzin <address@hidden>
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <address@hidden>
-;;; Copyright © 2015, 2017 Mark H Weaver <address@hidden>
+;;; Copyright © 2015, 2017, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2016 David Thompson <address@hidden>
- ;;; Copyright © 2017 ng0 <address@hidden>
+ ;;; Copyright © 2017 Nils Gillmann <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/check.scm
index baebcb9,b279646..1fe1312
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -23,8 -23,8 +23,8 @@@
;;; Copyright © 2017 Frederick M. Muriithi <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Kei Kebreau <address@hidden>
- ;;; Copyright © 2017 ng0 <address@hidden>
+ ;;; Copyright © 2017 Nils Gillmann <address@hidden>
-;;; Copyright © 2015, 2017 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016, 2017, 2018 Marius Bakke <address@hidden>
;;; Copyright © 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2018 Fis Trivial <address@hidden>
diff --cc gnu/packages/guile.scm
index 160c4c3,0360312..ea7099d
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -14,8 -14,8 +14,8 @@@
;;; Copyright © 2017 David Thompson <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Theodoros Foradis <address@hidden>
- ;;; Copyright © 2017 ng0 <address@hidden>
+ ;;; Copyright © 2017 Nils Gillmann <address@hidden>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Maxim Cournoyer <address@hidden>
;;;
;;; This file is part of GNU Guix.
diff --cc gnu/packages/perl.scm
index 11765b8,39449d9..bb20895
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@@ -4,10 -4,10 +4,10 @@@
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015, 2016, 2017 Eric Bavier <address@hidden>
;;; Copyright © 2015 Eric Dvorsak <address@hidden>
-;;; Copyright © 2016 Mark H Weaver <address@hidden>
+;;; Copyright © 2016, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2016 Jochem Raat <address@hidden>
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
- ;;; Copyright © 2016 ng0 <address@hidden>
+ ;;; Copyright © 2016 Nils Gillmann <address@hidden>
;;; Copyright © 2016 Alex Sassmannshausen <address@hidden>
;;; Copyright © 2016 Roel Janssen <address@hidden>
;;; Copyright © 2016 Ben Woodcroft <address@hidden>
diff --cc gnu/packages/qt.scm
index b505d8d,0584a5d..8593f22
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -3,9 -3,9 +3,9 @@@
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
;;; Copyright © 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
- ;;; Copyright © 2016, 2017 ng0 <address@hidden>
+ ;;; Copyright © 2016, 2017 Nils Gillmann <address@hidden>
;;; Copyright © 2016 Thomas Danckaert <address@hidden>
-;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2017 Quiliro <address@hidden>
;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Nicolas Goaziou <address@hidden>
diff --cc gnu/packages/tls.scm
index a33c1a5,e349cff..bb59ff2
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -4,9 -4,9 +4,9 @@@
;;; Copyright © 2014 Ian Denhardt <address@hidden>
;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2015 David Thompson <address@hidden>
-;;; Copyright © 2015, 2016, 2017 Leo Famulari <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018 Leo Famulari <address@hidden>
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
- ;;; Copyright © 2016, 2017 ng0 <address@hidden>
+ ;;; Copyright © 2016, 2017 Nils Gillmann <address@hidden>
;;; Copyright © 2016 Hartmut Goebel <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
diff --cc gnu/packages/wm.scm
index 97d5d57,608e594..1b14973
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@@ -8,8 -8,8 +8,8 @@@
;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Al McElrath <address@hidden>
;;; Copyright © 2016 Carlo Zancanaro <address@hidden>
-;;; Copyright © 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <address@hidden>
- ;;; Copyright © 2016, 2017, 2018 ng0 <address@hidden>
+ ;;; Copyright © 2016, 2017, 2018 Nils Gillmann <address@hidden>
;;; Copyright © 2016 doncatnip <address@hidden>
;;; Copyright © 2016 Ivan Vilata i Balaguer <address@hidden>
;;; Copyright © 2017 Mekeor Melire <address@hidden>
diff --cc gnu/packages/xorg.scm
index 0dbc362,9652e15..d8bfa90
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -1060,10 -1036,10 +1060,10 @@@ of new capabilities and controls for te
name "-" version ".tar.bz2"))
(sha256
(base32
- "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"))))
+ "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("xproto" ,xproto)))
+ (inputs `(("xorgproto" ,xorgproto)))
(home-page "https://www.x.org/";)
(synopsis "Xorg shared memory fences library")
(description
@@@ -3726,10 -3717,10 +3726,10 @@@ alternative implementations like XRand
".tar.bz2"))
(sha256
(base32
- "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"))))
+ "0djp7bb0ch2ddwmc1bkg4fddxdvamiiz375x0r0ni5dcb37w93bl"))))
(build-system gnu-build-system)
(inputs
- `(("xproto" ,xproto)
+ `(("xorgproto" ,xorgproto)
("libxkbfile" ,libxkbfile)
("libx11" ,libx11)))
(native-inputs