unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: ludo@gnu.org (Ludovic Courtès)
To: Leo Famulari <leo@famulari.name>
Cc: 27811@debbugs.gnu.org
Subject: bug#27811: net-tools patch has no effect?
Date: Tue, 25 Jul 2017 23:33:08 +0200	[thread overview]
Message-ID: <878tjcb3sb.fsf@gnu.org> (raw)
In-Reply-To: <20170725175202.GA27528@jasmine.lan> (Leo Famulari's message of "Tue, 25 Jul 2017 13:52:02 -0400")

Leo Famulari <leo@famulari.name> skribis:

> From 5c738ab1ec5543981c9d5e512ee94d469bcca12b Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@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’.

  parent reply	other threads:[~2017-07-25 21:34 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-24 22:02 bug#27811: net-tools patch has no effect? Leo Famulari
2017-07-25  4:12 ` Leo Famulari
2017-07-25  4:59   ` Leo Famulari
2017-07-25  8:27     ` Ludovic Courtès
2017-07-25 16:10       ` Leo Famulari
2017-07-25 17:52       ` Leo Famulari
2017-07-25 17:53         ` Leo Famulari
2017-07-25 18:03         ` Leo Famulari
2017-07-25 18:08           ` Leo Famulari
2017-07-25 21:30             ` Ludovic Courtès
2017-07-25 21:33         ` Ludovic Courtès [this message]
2017-07-26 16:08           ` Leo Famulari
2017-07-26 16:11         ` Leo Famulari
2017-07-26 21:04           ` Ludovic Courtès
2017-07-27 17:41             ` Leo Famulari

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=878tjcb3sb.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=27811@debbugs.gnu.org \
    --cc=leo@famulari.name \
    /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).