guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'origin/core-updates-next' into core-updates


From: Ricardo Wurmus
Subject: 01/01: Merge branch 'origin/core-updates-next' into core-updates
Date: Wed, 6 Jun 2018 17:02:42 -0400 (EDT)

rekado pushed a commit to branch core-updates
in repository guix.

commit 87096247567ac0d4aac3fc5a7a1e150d307c5b80
Merge: 116ca65 5e6bd3e
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Jun 6 23:01:48 2018 +0200

    Merge branch 'origin/core-updates-next' into core-updates

 gnu/local.mk                                       |   3 +-
 gnu/packages/boost.scm                             |   4 +-
 gnu/packages/cmake.scm                             |  11 +-
 gnu/packages/compression.scm                       |   4 +-
 gnu/packages/cups.scm                              |  11 +-
 gnu/packages/databases.scm                         |   4 +-
 gnu/packages/file.scm                              |   5 +-
 gnu/packages/glib.scm                              |  12 +-
 gnu/packages/gnupg.scm                             |   5 +-
 gnu/packages/gtk.scm                               |   8 +-
 gnu/packages/image.scm                             |   4 +-
 gnu/packages/jemalloc.scm                          |   5 +-
 gnu/packages/libevent.scm                          |   4 +-
 gnu/packages/libsigsegv.scm                        |  33 ++--
 .../patches/cups-fix-builds-without-PAM.patch      | 201 +++++++++++++++++++++
 .../patches/jemalloc-arm-address-bits.patch        |  39 ----
 .../patches/libgpg-error-aarch64-logging-fix.patch |  58 ------
 gnu/packages/pdf.scm                               |   6 +-
 gnu/packages/python.scm                            |   4 +-
 guix/build/gremlin.scm                             | 132 ++++++++++----
 guix/build/meson-build-system.scm                  |   2 +-
 tests/gremlin.scm                                  |  35 +++-
 22 files changed, 398 insertions(+), 192 deletions(-)

diff --cc gnu/packages/pdf.scm
index fb7fd3d,ca3a601..a215fce
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -10,10 -10,10 +10,10 @@@
  ;;; Copyright © 2016, 2017 Ludovic Courtès <address@hidden>
  ;;; Copyright © 2016 Julien Lepiller <address@hidden>
  ;;; Copyright © 2016 Arun Isaac <address@hidden>
 -;;; Copyright © 2017 Leo Famulari <address@hidden>
 +;;; Copyright © 2017, 2018 Leo Famulari <address@hidden>
  ;;; Copyright © 2017 Alex Vong <address@hidden>
  ;;; Copyright © 2017 Rene Saavedra <address@hidden>
- ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]