nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: hiawatha: Update to 10.8.3. 

* gnu/packages/web.scm (hiawatha): Update to 10.8.3.
[source]: Also delete bundled copy of nghttp2.
[inputs]: Use mbedtls-for-hiawatha instead of vanilla mbedtls-apache.
* gnu/packages/tls.scm (mbedtls-for-hiawatha): New public variable.
This commit is contained in:
Tobias Geerinckx-Rice 2018-10-04 17:26:57 +02:00
parent 38a9bf805d
commit 8e87aa0497
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/tls.scm
View File

@ -869,6 +869,24 @@ coding footprint.")
(home-page "https://tls.mbed.org") (home-page "https://tls.mbed.org")
(license license:asl2.0))) (license license:asl2.0)))
;; The Hiawatha Web server requires some specific features to be enabled.
(define-public mbedtls-for-hiawatha
(hidden-package
(package
(inherit mbedtls-apache)
(arguments
(substitute-keyword-arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'configure 'configure-extra-features
(lambda _
(for-each (lambda (feature)
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
#t)))
,@(package-arguments mbedtls-apache)))))))
(define-public ghc-tls (define-public ghc-tls
(package (package
(name "ghc-tls") (name "ghc-tls")

15
gnu/packages/web.scm
View File

@ -5173,7 +5173,7 @@ functions of Tidy.")
(define-public hiawatha (define-public hiawatha
(package (package
(name "hiawatha") (name "hiawatha")
(version "10.7") (version "10.8.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5181,15 +5181,16 @@ functions of Tidy.")
"hiawatha-" version ".tar.gz")) "hiawatha-" version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (snippet '(begin
;; We use our packaged mbedtls, so delete the included copy. ;; We use packaged libraries, so delete the bundled copies.
(delete-file-recursively "mbedtls") (for-each delete-file-recursively
(list "nghttp2" "mbedtls"))
#t)) #t))
(sha256 (sha256
(base32 (base32
"0x2zfc8kc6c7rl4gwymwmg13w1c60biv6c6c9fvzpnl59bc9jgin")))) "0w7047pwijhsbvvv1qjynp7gvn0nil56w82f7ax0gabrg7ddzk6s"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; No tests included `(#:tests? #f ; no tests included
#:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on") #:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on")
(string-append "-DENABLE_TOMAHAWK=on") (string-append "-DENABLE_TOMAHAWK=on")
(string-append "-DWEBROOT_DIR=" (string-append "-DWEBROOT_DIR="
@ -5212,8 +5213,8 @@ functions of Tidy.")
(wrap-program (string-append sbin "/hiawatha") (wrap-program (string-append sbin "/hiawatha")
`("PATH" ":" prefix (,mbed))))))))) `("PATH" ":" prefix (,mbed)))))))))
(inputs (inputs
;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha" ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha".
`(("mbedtls-apache" ,mbedtls-apache) ;Hiawatha includes this version. `(("mbedtls-apache" ,mbedtls-for-hiawatha)
("zlib" ,zlib) ("zlib" ,zlib)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))