From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
To: 74391@debbugs.gnu.org
Cc: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Subject: [bug#74391] [PATCH 2/2] gnu: sslh: Use GEXPs.
Date: Sun, 17 Nov 2024 12:02:27 +0300 [thread overview]
Message-ID: <2924c8c2d1d1ee64f90867729d837724edf98119.1731833680.git.poptsov.artyom@gmail.com> (raw)
In-Reply-To: <cover.1731833680.git.poptsov.artyom@gmail.com>
* gnu/packages/networking.scm (sslh): Use GEXPs.
Change-Id: I5b31afdfeb1f1f9b2e5f86290adc405f3a90a367
---
gnu/packages/networking.scm | 61 ++++++++++++++++++-------------------
1 file changed, 29 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 091ed06d3d..6017654866 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2740,38 +2740,35 @@ (define-public sslh
(inputs
(list libev libconfig pcre))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'check 'fix-tests
- (lambda _
- (substitute* "t"
- ;; XXX: Disable a failing test.
- (("my \\$DROP_CNX = 1;")
- "my $DROP_CNX = 0;")
- ;; XXX: "sslh-select" seems to not support this option for some
- ;; reason. According to "sslhconf.cfg" this option just overrides the
- ;; verbosity configuration so it seems that we can safely drop it.
- (("-v 4")
- ""))
- (substitute* "test.cfg"
- ;; The Guix build environment lacks ‘ip4-localhost’.
- (("ip4-localhost") "localhost"))
- #t))
- ;; Many of these files are mentioned in the man page. Install them.
- (add-after 'install 'install-documentation
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (string-append out "/share/doc/sslh")))
- (install-file "README.md" doc)
- (for-each
- (lambda (file)
- (install-file file (string-append doc "/examples")))
- (append (find-files "." "\\.cfg")
- (find-files "scripts"))))
- #t)))
- #:make-flags (list ,(string-append "CC=" (cc-for-target))
- "USELIBCONFIG=1"
- (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'fix-tests
+ (lambda _
+ (substitute* "t"
+ ;; XXX: Disable a failing test.
+ (("my \\$DROP_CNX = 1;")
+ "my $DROP_CNX = 0;")
+ ;; XXX: "sslh-select" seems to not support this option for some
+ ;; reason. According to "sslhconf.cfg" this option just overrides the
+ ;; verbosity configuration so it seems that we can safely drop it.
+ (("-v 4")
+ ""))
+ (substitute* "test.cfg"
+ ;; The Guix build environment lacks ‘ip4-localhost’.
+ (("ip4-localhost") "localhost"))))
+ ;; Many of these files are mentioned in the man page. Install them.
+ (add-after 'install 'install-documentation
+ (lambda _
+ (let* ((doc (string-append #$output "/share/doc/sslh")))
+ (install-file "README.md" doc)
+ (for-each
+ (lambda (file)
+ (install-file file (string-append doc "/examples")))
+ (append (find-files "." "\\.cfg")
+ (find-files "scripts")))))))
+ #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ "USELIBCONFIG=1"
+ (string-append "PREFIX=" #$output))
#:test-target "test"))
(home-page "https://www.rutschle.net/tech/sslh/README.html")
(synopsis "Applicative network protocol demultiplexer")
--
2.46.0
prev parent reply other threads:[~2024-11-17 9:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-17 8:59 [bug#74391] [PATCH 0/2] gnu: sslh: Update to 2.1.2 Artyom V. Poptsov
2024-11-17 9:02 ` [bug#74391] [PATCH 1/2] " Artyom V. Poptsov
2024-11-17 9:02 ` Artyom V. Poptsov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2924c8c2d1d1ee64f90867729d837724edf98119.1731833680.git.poptsov.artyom@gmail.com \
--to=poptsov.artyom@gmail.com \
--cc=74391@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).