ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-14 07:00:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nghttp2: Update to 1.35.1.

Browse source 
* gnu/packages/web.scm (nghttp2): Update to 1.35.1.
[native-inputs]: Add GCC-7.
[arguments]: Add workaround for <https://bugs.gnu.org/30756>.
This commit is contained in:
Marius Bakke 2018-12-10 01:26:05 +01:00
parent 62c75d6d08
commit 6a4d56346c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/web.scm
View file

@ -79,6 +79,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -6696,7 +6697,7 @@ (define-public cat-avatar-generator
(define-public nghttp2 (define-public nghttp2
(package (package
(name "nghttp2") (name "nghttp2")
(version "1.32.0") (version "1.35.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6705,12 +6706,13 @@ (define-public nghttp2
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0zbgp8f80h2zlfn8cd2ldrmgl81jzcdh1141n71aqmfckzaqj2kh")))) "0fi6qg2w82636wixwkqy7bclpgxslmvg82r431hs8h6aqc4mnzwv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs (list "out" (outputs (list "out"
"lib")) ; only libnghttp2 "lib")) ; only libnghttp2
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("gcc" ,gcc-7) ; 1.35.0 requires GCC6 or later
;; Required by tests. ;; Required by tests.
("cunit" ,cunit) ("cunit" ,cunit)
@ -6742,6 +6744,9 @@ (define-public nghttp2
(("@prefix@") (("@prefix@")
(assoc-ref outputs "lib"))) (assoc-ref outputs "lib")))
#t)) #t))
(add-before 'configure 'work-around-bug-30756
(lambda _
(for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t))
(add-before 'check 'set-timezone-directory (add-before 'check 'set-timezone-directory
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata")