diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2023-03-17 22:03:56 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-03-26 23:27:59 +0200 |
| commit | fa715278bcb62874580d4b72ad3b0545e8a686e5 (patch) | |
| tree | bc9c1eb612bd57b3e42f71a08357a264331bfcca | |
| parent | f5c62f106d598b1edca48cdb623345af34348e5e (diff) | |
| download | guix-fa715278bcb62874580d4b72ad3b0545e8a686e5.tar.gz guix-fa715278bcb62874580d4b72ad3b0545e8a686e5.zip | |
gnu: haproxy: Update to 2.7.5.
* gnu/packages/networking.scm (haproxy): Update to 2.7.4.
[arguments]: Use Gexp.
<make-flags>: Add extra build options 'USE_PCRE2_JIT' enables JIT for
faster regex on libpcre2, 'USE_PROMEX' enables the Prometheus
exporter. Set CC to use cc-for-target, point 'LUA_INC' and 'LUA_LIB'
to corresponded '/include' and '/lib' outputs of Lua. Replace
'USE_PCRE_2' by correct option 'USE_PCRE2'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/networking.scm | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ecb1d16615..7d4a928ad7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4239,30 +4239,36 @@ cables.") (define-public haproxy (package (name "haproxy") - (version "2.1.7") - (source (origin - (method url-fetch) - (uri (string-append "https://www.haproxy.org/download/" - (version-major+minor version) - "/src/haproxy-" version ".tar.gz")) - (sha256 - (base32 - "0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir")))) + (version "2.7.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haproxy.org/download/" + (version-major+minor version) + "/src/haproxy-" version ".tar.gz")) + (sha256 + (base32 "00j5lwvrf8lgfid3108gclxbd46v3mnd4lh0lw4l0nn3f0rf9ip2")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (let* ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out) - (string-append "DOCDIR=" out "/share/" ,name) - "TARGET=linux-glibc" - "USE_LUA=1" - "USE_OPENSSL=1" - "USE_ZLIB=1" - "USE_PCRE_2=1")) - #:tests? #f ; there are only regression tests, using varnishtest - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list + #:tests? #f ; there are only regression tests, using varnishtest + #:make-flags + #~(list "LUA_LIB_NAME=lua" + "TARGET=linux-glibc" + "USE_LUA=1" + "USE_OPENSSL=1" + "USE_PCRE2=1" + "USE_PCRE2_JIT=1" + "USE_PROMEX=1" + "USE_ZLIB=1" + (string-append "CC=" #$(cc-for-target)) + (string-append "DOCDIR=" #$output "/share/" #$name) + (string-append "LUA_INC=" #$(this-package-input "lua") "/include") + (string-append "LUA_LIB=" #$(this-package-input "lua") "/lib") + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (inputs (list lua openssl pcre2 zlib)) (home-page "https://www.haproxy.org/") |