08/18: gnu: c-ares: Absorb grafted replacement.

[guix-commits]

lfam pushed a commit to branch wip-next-release
in repository guix.

commit d44ca94f7748d1ac4945a1e4e1d95f7d067abc1e
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Mar 12 13:11:08 2021 -0500

    gnu: c-ares: Absorb grafted replacement.
    
    * gnu/packages/adns.scm (c-ares): Update to 1.17.1.
    [arguments]: Skip the test suite.
    [replacement]: Remove field.
    (c-ares/fixed): Remove variable.
---
 gnu/packages/adns.scm | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm
index b36ec18..8e78029 100644
--- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,7 +66,7 @@ scripts.")
 (define-public c-ares
   (package
     (name "c-ares")
-    (version "1.16.0")
+    (version "1.17.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -73,9 +74,11 @@ scripts.")
                     ".tar.gz"))
               (sha256
                (base32
-                "129sm0wzij0mp8vdv68v18hnykcjb6ivi66wnqnnw598q7bql1fy"))))
-    (replacement c-ares/fixed)
+                "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"))))
     (build-system gnu-build-system)
+    (arguments
+     `(;; FIXME: Some tests require network access
+       #:tests? #f))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://c-ares.haxx.se/";)
@@ -88,23 +91,6 @@ The primary examples of such applications are servers which 
communicate with
 multiple clients and programs with graphical user interfaces.")
     (license (x11-style "https://c-ares.haxx.se/license.html";))))
 
-(define-public c-ares/fixed
-  (package
-    (inherit c-ares)
-    (name "c-ares")
-    (version "1.17.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://c-ares.haxx.se/download/"; name "-" version
-                    ".tar.gz"))
-              (sha256
-               (base32
-                "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"))))
-    (arguments
-     `(;; FIXME: Some tests require network access
-       #:tests? #f))))
-
 ;; gRPC requires a c-ares built with CMake in order to get the .cmake modules.
 ;; We can not build c-ares itself with CMake because that would introduce a
 ;; circular dependency through nghttp2.