[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/13: gnu: lighttpd: Update style.
From: |
guix-commits |
Subject: |
10/13: gnu: lighttpd: Update style. |
Date: |
Wed, 11 May 2022 18:31:49 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit cd00881d72830ef9293c2693a9eb24d5692b2ab8
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun May 8 02:00:01 2022 +0200
gnu: lighttpd: Update style.
* gnu/packages/web.scm (lighttpd)[arguments]:
Rewrite as G-expressions. Don't explicitly return #t from phases.
[inputs]: Remove input labels.
---
gnu/packages/web.scm | 82 +++++++++++++++++++++++++---------------------------
1 file changed, 40 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 37ae528f08..5e200d13cc 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -838,50 +838,48 @@ stream. Remote control of the module is possible over
HTTP.")
"09hf3cp4ivy9a9z9drgi4f6d60137dcqncqw0wpbyvs9lygrsj71"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list "--with-krb5"
- "--with-ldap"
- "--with-libev"
- "--with-libunwind"
- "--with-openssl"
- "--with-pam"
- "--with-sasl")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'embed-/bin/sh-reference
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/mod_ssi.c"
- (("/bin/sh") (search-input-file inputs "/bin/sh")))
- #t))
- (add-after 'unpack 'fix-tests
- (lambda _
- (setenv "SHELL" (which "sh"))
- ;; gethostbyaddr fails
- (substitute* "tests/LightyTest.pm"
- (("\\{HOSTNAME\\} = \\$name;")
- "{HOSTNAME} = \"127.0.0.1\";"))
- #t))
- (add-after 'unpack 'skip-failing-tests
- ;; XXX It would be wonderful if you, reader, felt suddenly and
- ;; irresistibly compelled to investigate & fix these failures.
- (lambda _
- ;; Throws a bunch of ‘connect failed: Connection refused’.
- (delete-file "tests/mod-scgi.t")
+ (list #:configure-flags
+ #~(list "--with-krb5"
+ "--with-ldap"
+ "--with-libev"
+ "--with-libunwind"
+ "--with-openssl"
+ "--with-pam"
+ "--with-sasl")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'embed-/bin/sh-reference
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/mod_ssi.c"
+ (("/bin/sh") (search-input-file inputs "/bin/sh")))))
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (setenv "SHELL" (which "sh"))
+ ;; gethostbyaddr fails
+ (substitute* "tests/LightyTest.pm"
+ (("\\{HOSTNAME\\} = \\$name;")
+ "{HOSTNAME} = \"127.0.0.1\";"))))
+ (add-after 'unpack 'skip-failing-tests
+ ;; XXX It would be wonderful if you, reader, felt suddenly and
+ ;; irresistibly compelled to investigate & fix these failures.
+ (lambda _
+ ;; Throws a bunch of ‘connect failed: Connection refused’.
+ (delete-file "tests/mod-scgi.t")
- ;; test_mod_ssi_read_fd: Assertion `cq->first' failed.
- (substitute* "src/t/test_mod.c"
- ((".*\\btest_mod_ssi\\b.*") "")))))))
+ ;; test_mod_ssi_read_fd: Assertion `cq->first' failed.
+ (substitute* "src/t/test_mod.c"
+ ((".*\\btest_mod_ssi\\b.*") "")))))))
(inputs
- `(("bash-minimal" ,bash-minimal)
- ("cyrus-sasl" ,cyrus-sasl)
- ("libev" ,libev)
- ("libunwind" ,libunwind)
- ("linux-pam" ,linux-pam)
- ("mit-krb5" ,mit-krb5)
- ("openldap" ,openldap)
- ("openssl" ,openssl)
- ("pcre2" ,pcre2)
- ("zlib" ,zlib)))
+ (list bash-minimal
+ cyrus-sasl
+ libev
+ libunwind
+ linux-pam
+ mit-krb5
+ openldap
+ openssl
+ pcre2
+ zlib))
(native-inputs
(list perl ; for tests
pkg-config which))
- 06/13: gnu: recutils: Remove some input labels., (continued)
- 06/13: gnu: recutils: Remove some input labels., guix-commits, 2022/05/11
- 13/13: gnu: beep: Drop obsolete $(pkgdocdir) make flag., guix-commits, 2022/05/11
- 08/13: gnu: lighttpd: Fix bash reference., guix-commits, 2022/05/11
- 09/13: gnu: lighttpd: Update to 1.4.64., guix-commits, 2022/05/11
- 12/13: gnu: beep: Use G-expressions., guix-commits, 2022/05/11
- 01/13: gnu: isc-dhcp: Update to 4.4.3., guix-commits, 2022/05/11
- 07/13: gnu: recutils: Fix cross-compilation., guix-commits, 2022/05/11
- 02/13: gnu: agda: Update to 2.6.2.2., guix-commits, 2022/05/11
- 03/13: gnu: agda: Use G-expressions., guix-commits, 2022/05/11
- 11/13: gnu: beep: Update to 1.4.12., guix-commits, 2022/05/11
- 10/13: gnu: lighttpd: Update style.,
guix-commits <=