[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
47/62: gnu: nghttp2: Remove input labels.
From: |
guix-commits |
Subject: |
47/62: gnu: nghttp2: Remove input labels. |
Date: |
Sun, 26 Jun 2022 06:09:11 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 3ab568573e220def0bcfaff56b289db166fdb110
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jun 26 02:41:18 2022 +0200
gnu: nghttp2: Remove input labels.
* gnu/packages/web.scm (nghttp2)[inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-DIRECTORY.
---
gnu/packages/web.scm | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index edffcd6711..6b34d5aa7a 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -7505,16 +7505,15 @@ derivation by David Revoy from the original MonsterID
by Andreas Gohr.")
cunit python tzdata-for-tests))
(inputs
;; Required to build the tools (i.e. without ‘--enable-lib-only’).
- `(("c-ares" ,c-ares)
- ("jansson" ,jansson) ; for HPACK tools
- ,@(if (hurd-target?) '()
- `(("jemalloc" ,jemalloc))) ; fight nghttpd{,x} heap fragmentation
- ("libev" ,libev)
- ("libxml2" ,libxml2) ; for ‘nghttp -a’
- ("openssl" ,openssl)
- ,@(if (hurd-target?)
- `(("openssl-static" ,openssl "static"))
- '())))
+ (append
+ (if (hurd-target?)
+ `(,openssl "static")
+ (list jemalloc)) ; fight nghttpd{,x} heap fragmentation
+ (list c-ares
+ jansson ; for HPACK tools
+ libev
+ libxml2 ; for ‘nghttp -a’
+ openssl)))
(arguments
`(#:configure-flags
(list (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib")
@@ -7539,10 +7538,9 @@ derivation by David Revoy from the original MonsterID by
Andreas Gohr.")
#t))
(add-before 'check 'set-timezone-directory
(lambda* (#:key inputs native-inputs #:allow-other-keys)
- (setenv "TZDIR" (string-append
- (assoc-ref (or native-inputs inputs) "tzdata")
- "/share/zoneinfo"))
- #t)))))
+ (setenv "TZDIR" (search-input-directory
+ (or native-inputs inputs)
+ "share/zoneinfo")))))))
(home-page "https://nghttp2.org/")
(synopsis "HTTP/2 protocol client, proxy, server, and library")
(description
- 27/62: gnu: xorgproto: Update to 2022.1., (continued)
- 27/62: gnu: xorgproto: Update to 2022.1., guix-commits, 2022/06/26
- 22/62: gnu: xcb-proto: Update to 1.15.2., guix-commits, 2022/06/26
- 09/62: gnu: libsigsegv: Update to 2.14., guix-commits, 2022/06/26
- 28/62: gnu: libxvmc: Update to 1.0.13., guix-commits, 2022/06/26
- 37/62: gnu: libevent: Remove input label., guix-commits, 2022/06/26
- 39/62: gnu: libtasn1: Update to 4.18.0., guix-commits, 2022/06/26
- 42/62: gnu: jemalloc: Update to 5.3.0., guix-commits, 2022/06/26
- 43/62: gnu: Remove jemalloc@4.5.0., guix-commits, 2022/06/26
- 45/62: gnu: mit-krb5: Remove label usage., guix-commits, 2022/06/26
- 44/62: gnu: mit-krb5: Update to 1.20., guix-commits, 2022/06/26
- 47/62: gnu: nghttp2: Remove input labels.,
guix-commits <=
- 49/62: gnu: dejagnu: Update to 1.6.3., guix-commits, 2022/06/26
- 51/62: gnu: procps: Use G-expressions., guix-commits, 2022/06/26
- 53/62: gnu: libarchive: Use G-expressions., guix-commits, 2022/06/26
- 58/62: gnu: libjpeg-turbo: Update to 2.1.3., guix-commits, 2022/06/26
- 57/62: gnu: rhash: Update to 1.4.3., guix-commits, 2022/06/26
- 62/62: gnu: ninja: Remove input label., guix-commits, 2022/06/26
- 08/62: gnu: lzip: Update to 1.23., guix-commits, 2022/06/26
- 19/62: gnu: libxslt: Remove input labels., guix-commits, 2022/06/26
- 10/62: gnu: libcap: Update to 2.64., guix-commits, 2022/06/26
- 30/62: gnu: libidn: Update to 1.41., guix-commits, 2022/06/26