* [bug#28321] [PATCH] gnu: net-tools: Build from a source archive instead of a Git checkout.
@ 2017-09-01 19:49 Leo Famulari
2017-09-02 11:01 ` Marius Bakke
0 siblings, 1 reply; 3+ messages in thread
From: Leo Famulari @ 2017-09-01 19:49 UTC (permalink / raw)
To: 28321
* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#28321] [PATCH] gnu: net-tools: Build from a source archive instead of a Git checkout.
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
2017-09-02 15:08 ` bug#28321: " Leo Famulari
0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2017-09-02 11:01 UTC (permalink / raw)
To: Leo Famulari, 28321
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#28321: [PATCH] gnu: net-tools: Build from a source archive instead of a Git checkout.
2017-09-02 11:01 ` Marius Bakke
@ 2017-09-02 15:08 ` Leo Famulari
0 siblings, 0 replies; 3+ messages in thread
From: Leo Famulari @ 2017-09-02 15:08 UTC (permalink / raw)
To: Marius Bakke; +Cc: 28321-done
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
On Sat, Sep 02, 2017 at 01:01:24PM +0200, Marius Bakke wrote:
> 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.
> > + (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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-02 15:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2017-09-02 15:08 ` bug#28321: " Leo Famulari
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).