Leo Famulari <l...@famulari.name> skribis:
> From 5c738ab1ec5543981c9d5e512ee94d469bcca12b Mon Sep 17 00:00:00 2001
> From: Leo Famulari <l...@famulari.name>
> Date: Tue, 25 Jul 2017 00:19:56 -0400
> Subject: [PATCH 1/2] gnu: net-tools: Add a test-only variant and use it for
> GnuTLS.
>
> * gnu/packages/linux.scm (net-tools-for-tests): Add net-tools variant
> for the GnuTLS test suite, et cetera.
> (net-tools): Inherit from net-tools-for-tests.
> * gnu/packages/tls.scm (gnutls)[native-inputs]: Use net-tools-for-tests
> instead of net-tools.
> ---
> gnu/packages/linux.scm | 5 ++++-
> gnu/packages/tls.scm | 4 +++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 456909a94..4f9fa6d25 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -1187,7 +1187,7 @@ consists of several tools, of which the most important
> are @command{ip} and
> messages and are accompanied by a set of manpages.")
> (license license:gpl2+)))
>
> -(define-public net-tools
> +(define net-tools-for-tests
Use ‘define-public’ here, and perhaps add a comment explaining the intent.
> ;; XXX: This package is basically unmaintained, but it provides a few
> ;; commands not yet provided by Inetutils, such as 'route', so we have to
> ;; live with it.
> @@ -1288,6 +1288,9 @@ network hardware types (plipconfig, slattach) and
> advanced aspects of IP
> configuration (iptunnel, ipmaddr).")
> (license license:gpl2+)))
>
> +(define-public net-tools
> + (package (inherit net-tools-for-tests)))
I would tend to do it the other way around, and simply start with:
(define-public net-tools-for-tests
net-tools)
and change that whenever we need it.
> +;; TODO Add net-tools to #:disallowed-references when we can afford to
> rebuild
> +;; GnuTLS.
> (define-public gnutls
> (package
> (name "gnutls")
> @@ -194,7 +196,7 @@ living in the same process.")
> "debug"
> "doc")) ;4.1 MiB of man pages
> (native-inputs
> - `(("net-tools" ,net-tools)
> + `(("net-tools" ,(@@ (gnu packages linux) net-tools-for-tests))
Remove the “@@” once ‘net-tools-for-tests’ is public.
OK with these changes, thank you!
Ludo’.
