01/01: Merge branch 'master' into core-updates

[Mark H. Weaver]

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

commit ab9da9ec66a0631dfb97f059f9c8693ad8000e6d
Merge: 0661758 4699ffa
Author: Mark H Weaver <address@hidden>
Date:   Mon May 21 13:41:18 2018 -0400

    Merge branch 'master' into core-updates

 gnu/packages/curl.scm           | 14 ++++++++++++++
 gnu/packages/dns.scm            |  4 ++--
 gnu/packages/linux.scm          | 13 ++-----------
 gnu/packages/patches/pius.patch | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 13 deletions(-)

diff --cc gnu/packages/curl.scm
index 78dcc64,16cbdcd..65bc698
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -50,7 -49,8 +50,8 @@@
  (define-public curl
    (package
     (name "curl")
 -   (version "7.57.0")
 +   (version "7.59.0")
+    (replacement curl-7.60.0)
     (source (origin
              (method url-fetch)
              (uri (string-append "https://curl.haxx.se/download/curl-";