From: Marius Bakke <mbakke@fastmail.com>
To: Leo Famulari <leo@famulari.name>, 28321@debbugs.gnu.org
Subject: [bug#28321] [PATCH] gnu: net-tools: Build from a source archive instead of a Git checkout.
Date: Sat, 02 Sep 2017 13:01:24 +0200 [thread overview]
Message-ID: <87efrpl5yz.fsf@fastmail.com> (raw)
In-Reply-To: <86632647dc295f5277452ef0a87372ea77344af4.1504295367.git.leo@famulari.name>
[-- Attachment #1: Type: text/plain, Size: 2692 bytes --]
Leo Famulari <leo@famulari.name> writes:
> * gnu/packages/linux.scm (net-tools)[source]: Use url-fetch and adjust
> the source URL accordingly.
> [native-inputs]: Add UNZIP.
> (net-tools-for-tests)[native-inputs]: Add field so that we can exclude UNZIP.
[...]
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index c01cbf1b3..303079b49 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -1212,14 +1212,14 @@ messages and are accompanied by a set of manpages.")
> (name "net-tools")
> (version (string-append "1.60-" revision "." (string-take commit 7)))
> (source (origin
> - (method git-fetch)
> - (uri (git-reference
> - (url "https://git.code.sf.net/p/net-tools/code")
> - (commit commit)))
> - (file-name (string-append name "-" version "-checkout"))
> + (method url-fetch)
> + (uri (string-append "https://sourceforge.net/code-snapshots/git/"
> + "n/ne/net-tools/code.git/net-tools-code-"
> + commit ".zip"))
> + (file-name (string-append name "-" version ".zip"))
> (sha256
> (base32
> - "189mdjfbd7j7j0jysy34nqn5byy9g5f6ylip1sikk7kz08vjml4s"))))
> + "0hz9fda9d78spp774b6rr5xaxav7cm4h0qcpxf70rvdbrf6qx7vy"))))
> (home-page "http://net-tools.sourceforge.net/")
> (build-system gnu-build-system)
> (arguments
> @@ -1266,7 +1266,8 @@ messages and are accompanied by a set of manpages.")
> (string-append "BASEDIR=" out)
> (string-append "INSTALLNLSDIR=" out "/share/locale")
> (string-append "mandir=/share/man")))))
> - (native-inputs `(("gettext" ,gettext-minimal)))
> + (native-inputs `(("gettext" ,gettext-minimal)
> + ("unzip" ,unzip)))
> (synopsis "Tools for controlling the network subsystem in Linux")
> (description
> "This package includes the important tools for controlling the network
> @@ -1355,6 +1356,8 @@ configuration (iptunnel, ipmaddr).")
> (string-append "INSTALLNLSDIR=" out "/share/locale")
> (string-append "mandir=/share/man")))))
>
> + (native-inputs `(("gettext" ,gettext-minimal)))
Can you add a short comment mentioning why we override native-inputs here?
Apart from that LGTM. I assume you know whether or not this has to go
through 'core-updates'.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2017-09-02 11:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-01 19:49 [bug#28321] [PATCH] gnu: net-tools: Build from a source archive instead of a Git checkout Leo Famulari
2017-09-02 11:01 ` Marius Bakke [this message]
2017-09-02 15:08 ` bug#28321: " 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=87efrpl5yz.fsf@fastmail.com \
--to=mbakke@fastmail.com \
--cc=28321@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).