me/guix
Archived
1
0
Fork 0
Code Activity

gnu: lighttpd: Update style.

Browse source 
* gnu/packages/web.scm (lighttpd)[arguments]:
Rewrite as G-expressions.  Don't explicitly return #t from phases.
[inputs]: Remove input labels.
This commit is contained in:
Tobias Geerinckx-Rice 2022-05-08 02:00:01 +02:00
parent fd7130e4b5
commit cd00881d72
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 40 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/web.scm
View file

@ -838,8 +838,8 @@ stream. Remote control of the module is possible over HTTP.")
"09hf3cp4ivy9a9z9drgi4f6d60137dcqncqw0wpbyvs9lygrsj71")))) "09hf3cp4ivy9a9z9drgi4f6d60137dcqncqw0wpbyvs9lygrsj71"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list #:configure-flags
(list "--with-krb5" #~(list "--with-krb5"
"--with-ldap" "--with-ldap"
"--with-libev" "--with-libev"
"--with-libunwind" "--with-libunwind"
@ -847,20 +847,18 @@ stream. Remote control of the module is possible over HTTP.")
"--with-pam" "--with-pam"
"--with-sasl") "--with-sasl")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'embed-/bin/sh-reference (add-after 'unpack 'embed-/bin/sh-reference
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/mod_ssi.c" (substitute* "src/mod_ssi.c"
(("/bin/sh") (search-input-file inputs "/bin/sh"))) (("/bin/sh") (search-input-file inputs "/bin/sh")))))
#t))
(add-after 'unpack 'fix-tests (add-after 'unpack 'fix-tests
(lambda _ (lambda _
(setenv "SHELL" (which "sh")) (setenv "SHELL" (which "sh"))
;; gethostbyaddr fails ;; gethostbyaddr fails
(substitute* "tests/LightyTest.pm" (substitute* "tests/LightyTest.pm"
(("\\{HOSTNAME\\} = \\$name;") (("\\{HOSTNAME\\} = \\$name;")
"{HOSTNAME} = \"127.0.0.1\";")) "{HOSTNAME} = \"127.0.0.1\";"))))
#t))
(add-after 'unpack 'skip-failing-tests (add-after 'unpack 'skip-failing-tests
;; XXX It would be wonderful if you, reader, felt suddenly and ;; XXX It would be wonderful if you, reader, felt suddenly and
;; irresistibly compelled to investigate & fix these failures. ;; irresistibly compelled to investigate & fix these failures.
@ -872,16 +870,16 @@ stream. Remote control of the module is possible over HTTP.")
(substitute* "src/t/test_mod.c" (substitute* "src/t/test_mod.c"
((".*\\btest_mod_ssi\\b.*") ""))))))) ((".*\\btest_mod_ssi\\b.*") "")))))))
(inputs (inputs
`(("bash-minimal" ,bash-minimal) (list bash-minimal
("cyrus-sasl" ,cyrus-sasl) cyrus-sasl
("libev" ,libev) libev
("libunwind" ,libunwind) libunwind
("linux-pam" ,linux-pam) linux-pam
("mit-krb5" ,mit-krb5) mit-krb5
("openldap" ,openldap) openldap
("openssl" ,openssl) openssl
("pcre2" ,pcre2) pcre2
("zlib" ,zlib))) zlib))
(native-inputs (native-inputs
(list perl ; for tests (list perl ; for tests
pkg-config which)) pkg-config which))