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

[guix-commits]

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

commit 15d1e2d3270cc67a94065c1aeeb5a713748b14a2
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Mon May 17 11:40:53 2021 -0400

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

diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm
index b36ec18..f3a821f 100644
--- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@ -65,7 +65,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 +73,10 @@ scripts.")
                     ".tar.gz"))
               (sha256
                (base32
-                "129sm0wzij0mp8vdv68v18hnykcjb6ivi66wnqnnw598q7bql1fy"))))
-    (replacement c-ares/fixed)
+                "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f)) ; The test suite requires network access
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://c-ares.haxx.se/";)
@@ -88,23 +89,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.