nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: net-tools: Build from a source archive instead of a Git checkout. 

* 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.
This commit is contained in:
Leo Famulari 2017-08-26 22:54:55 -04:00
parent d536113df0
commit 631c9f743f
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/linux.scm
View File

@ -1212,14 +1212,14 @@ messages and are accompanied by a set of manpages.")
(name "net-tools") (name "net-tools")
(version (string-append "1.60-" revision "." (string-take commit 7))) (version (string-append "1.60-" revision "." (string-take commit 7)))
(source (origin (source (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append "https://sourceforge.net/code-snapshots/git/"
(url "https://git.code.sf.net/p/net-tools/code") "n/ne/net-tools/code.git/net-tools-code-"
(commit commit))) commit ".zip"))
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version ".zip"))
(sha256 (sha256
(base32 (base32
"189mdjfbd7j7j0jysy34nqn5byy9g5f6ylip1sikk7kz08vjml4s")))) "0hz9fda9d78spp774b6rr5xaxav7cm4h0qcpxf70rvdbrf6qx7vy"))))
(home-page "http://net-tools.sourceforge.net/") (home-page "http://net-tools.sourceforge.net/")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -1266,7 +1266,8 @@ messages and are accompanied by a set of manpages.")
(string-append "BASEDIR=" out) (string-append "BASEDIR=" out)
(string-append "INSTALLNLSDIR=" out "/share/locale") (string-append "INSTALLNLSDIR=" out "/share/locale")
(string-append "mandir=/share/man"))))) (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") (synopsis "Tools for controlling the network subsystem in Linux")
(description (description
"This package includes the important tools for controlling the network "This package includes the important tools for controlling the network
@ -1355,6 +1356,15 @@ configuration (iptunnel, ipmaddr).")
(string-append "INSTALLNLSDIR=" out "/share/locale") (string-append "INSTALLNLSDIR=" out "/share/locale")
(string-append "mandir=/share/man"))))) (string-append "mandir=/share/man")))))
;; We added unzip to the net-tools package's native-inputs when
;; switching its source from a Git checkout to a zip archive. We
;; need to specify the native-inputs here to keep unzip out of the
;; build of net-tools-for-tests, so that we don't have to rebuild
;; many packages on the master branch. We can make
;; net-tools-for-tests inherit directly from net-tools in the next
;; core-updates cycle.
(native-inputs `(("gettext" ,gettext-minimal)))
;; Use the big Debian patch set (the thing does not even compile out of ;; Use the big Debian patch set (the thing does not even compile out of
;; the box.) ;; the box.)
;; XXX The patch is not actually applied, due to a bug in the 'patch' phase ;; XXX The patch is not actually applied, due to a bug in the 'patch' phase