From ad06f80cd789a5da4104a35c6d33ad58ebce7668 Mon Sep 17 00:00:00 2001 From: gabriel Date: Wed, 1 Feb 2023 13:52:43 +0100 Subject: [PATCH 4/4] gnu: hiawatha: Improve package style. * gnu/packages/web.scm (hiawatha) [source, arguments, inputs]: Whitespace adjustments following `guix style`. --- gnu/packages/web.scm | 54 +++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d92457ea6b..37cf1c4238 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6160,16 +6160,16 @@ (define-public hiawatha (package (name "hiawatha") (version "11.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.hiawatha-webserver.org/files/" - "hiawatha-" version ".tar.gz")) - (sha256 - (base32 "1i8vrxbvpcj6yxmshbg19gm9g8vrxds6pdra0sgld4vzj9v4zilr")))) + (source (origin + (method url-fetch) + (uri (string-append "https://www.hiawatha-webserver.org/files/" + "hiawatha-" version ".tar.gz")) + (sha256 + (base32 + "1i8vrxbvpcj6yxmshbg19gm9g8vrxds6pdra0sgld4vzj9v4zilr")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no tests included + `(#:tests? #f ; no tests included #:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on") (string-append "-DENABLE_TOMAHAWK=on") (string-append "-DLOG_DIR=/var/log/hiawatha") @@ -6178,26 +6178,24 @@ (define-public hiawatha (assoc-ref %outputs "out") "/share/hiawatha/html") (string-append "-DWORK_DIR=/var/lib/hiawatha")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'install-no-empty-directories - (lambda _ - (substitute* "CMakeLists.txt" - (("install\\(DIRECTORY DESTINATION" match) - (string-append "#" match))) - #t)) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'hiawatha' finds 'mbedtls'. - (let* ((out (assoc-ref outputs "out")) - (sbin (string-append out "/sbin")) - (mbed (assoc-ref inputs "mbedtls-apache3"))) - (wrap-program (string-append sbin "/hiawatha") - `("PATH" ":" prefix (,mbed))))))))) - (inputs - ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha". - (list libxslt libxml2 mbedtls-for-hiawatha - `(,nghttp2 "lib") zlib)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'install-no-empty-directories + (lambda _ + (substitute* "CMakeLists.txt" + (("install\\(DIRECTORY DESTINATION" match) + (string-append "#" match))) #t)) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make sure 'hiawatha' finds 'mbedtls'. + (let* ((out (assoc-ref outputs "out")) + (sbin (string-append out "/sbin")) + (mbed (assoc-ref inputs "mbedtls-apache3"))) + (wrap-program (string-append sbin "/hiawatha") + `("PATH" ":" prefix + (,mbed))))))))) + (inputs ; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha". + (list libxslt libxml2 mbedtls-for-hiawatha + `(,nghttp2 "lib") zlib)) (home-page "https://www.hiawatha-webserver.org") (synopsis "Webserver with focus on security") (description -- 2.39.1