Merge branch 'master' into core-updates

diff --cc gnu/packages/curl.scm
index 78dcc64,16cbdcd..65bc698
--- 1/gnu/packages/curl.scm
--- 2/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-"

diff --cc gnu/packages/dns.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge