mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: c-ares: Remove replacement package.

Browse source 
* gnu/packages/adns.scm (c-ares): Update to 1.17.1.
[arguments]: New field.
(c-ares/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2021-05-09 22:48:45 +02:00
parent d954d7682d
commit e2093c0f3e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/adns.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -65,7 +65,7 @@ (define-public adns
(define-public c-ares (define-public c-ares
(package (package
(name "c-ares") (name "c-ares")
(version "1.16.1") (version "1.17.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -73,9 +73,15 @@ (define-public c-ares
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1kl6bzlcmxn0524h5qldlbh99wf96whhvk54w3p4igf3xk8150yh")))) "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"))))
(replacement c-ares/fixed)
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'check 'filter-live-tests
(lambda _
;; Filter tests that require internet access.
(setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*"))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "https://c-ares.haxx.se/") (home-page "https://c-ares.haxx.se/")
@ -88,23 +94,6 @@ (define-public c-ares
multiple clients and programs with graphical user interfaces.") multiple clients and programs with graphical user interfaces.")
(license (x11-style "https://c-ares.haxx.se/license.html")))) (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. ;; 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 ;; We can not build c-ares itself with CMake because that would introduce a
;; circular dependency through nghttp2. ;; circular dependency through nghttp2.