--- Begin Message ---
|
Subject: |
[PATCH] gnu: net-tools: Build from a source archive instead of a Git checkout. |
|
Date: |
Fri, 1 Sep 2017 15:49:27 -0400 |
* 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.
---
gnu/packages/linux.scm | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
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)))
+
;; Use the big Debian patch set (the thing does not even compile out of
;; the box.)
;; XXX The patch is not actually applied, due to a bug in the 'patch' phase
--
2.14.1
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#28321] [PATCH] gnu: net-tools: Build from a source archive instead of a Git checkout. |
|
Date: |
Sat, 2 Sep 2017 11:08:40 -0400 |
|
User-agent: |
Mutt/1.8.3 (2017-05-23) |
On Sat, Sep 02, 2017 at 01:01:24PM +0200, Marius Bakke wrote:
> Leo Famulari <address@hidden> 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.
> > + (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'.
We override the native-inputs of net-tools-for-tests so that this change
is suitable for the master branch. The net-tools-for-tests derivation
is unchanged.
Commented and pushed as 631c9f743fe45dfb1cc5d174b03e737a264b18e6.
signature.asc
Description: PGP signature
--- End Message ---