From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Subject: bug#27811: net-tools patch has no effect? Date: Tue, 25 Jul 2017 23:33:08 +0200 Message-ID: <878tjcb3sb.fsf@gnu.org> References: <20170725041225.GA31642@jasmine.lan> <20170725045947.GA531@jasmine.lan> <87shhkncq3.fsf@gnu.org> <20170725175202.GA27528@jasmine.lan> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da7Sv-0007Z4-9D for bug-guix@gnu.org; Tue, 25 Jul 2017 17:34:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1da7Ss-0007RB-5K for bug-guix@gnu.org; Tue, 25 Jul 2017 17:34:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53777) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1da7Ss-0007R0-1Q for bug-guix@gnu.org; Tue, 25 Jul 2017 17:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1da7Sr-0005w1-S8 for bug-guix@gnu.org; Tue, 25 Jul 2017 17:34:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20170725175202.GA27528@jasmine.lan> (Leo Famulari's message of "Tue, 25 Jul 2017 13:52:02 -0400") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Leo Famulari Cc: 27811@debbugs.gnu.org Leo Famulari skribis: > From 5c738ab1ec5543981c9d5e512ee94d469bcca12b Mon Sep 17 00:00:00 2001 > From: Leo Famulari > Date: Tue, 25 Jul 2017 00:19:56 -0400 > Subject: [PATCH 1/2] gnu: net-tools: Add a test-only variant and use it f= or > 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 import= ant are @command{ip} and > messages and are accompanied by a set of manpages.") > (license license:gpl2+))) >=20=20 > -(define-public net-tools > +(define net-tools-for-tests Use =E2=80=98define-public=E2=80=99 here, and perhaps add a comment explain= ing 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 a= dvanced aspects of IP > configuration (iptunnel, ipmaddr).") > (license license:gpl2+))) >=20=20 > +(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 r= ebuild > +;; 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 =E2=80=9C@@=E2=80=9D once =E2=80=98net-tools-for-tests=E2=80=99 = is public. OK with these changes, thank you! Ludo=E2=80=99.