gnu: net-tools-for-tests: Remove variable.

* gnu/packages/linux.scm (net-tools-for-tests): Remove variable.
* gnu/packages/tls.scm (gnutls)[native-inputs]: Replace
net-tools-for-tests with net-tools.
[disallowed-references]: Remove field.
This commit is contained in:
Efraim Flashner 2017-11-10 09:07:34 +02:00
parent 0f1adf454d
commit c06d8ba5ee
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
2 changed files with 2 additions and 17 deletions

View File

@ -1185,17 +1185,6 @@ primary network configuration tools, but ifconfig is known to behave
inadequately in modern network environments, and both should be deprecated.") inadequately in modern network environments, and both should be deprecated.")
(license license:gpl2+))) (license license:gpl2+)))
;; There are two packages for net-tools. The first, net-tools, can be used
;; directly on the command-line or when it will be referenced by a built
;; package. The second, net-tools-for-tests, can be used in package test suites
;; if it is not referred to by the built package. Net-tools-for-tests may be
;; relatively old and buggy. It should never be referred to by a built package.
;; Use #:disallowed-references to enforce this.
;;
;; When we are able to rebuild many packages (i.e. core-updates), we can update
;; net-tools-for-tests if appropriate.
;;
;; See <https://bugs.gnu.org/27811> for more information.
(define-public net-tools (define-public net-tools
;; XXX: This package is basically unmaintained, but it provides a few ;; XXX: This package is basically unmaintained, but it provides a few
;; commands not yet provided by Inetutils, such as 'route', so we have to ;; commands not yet provided by Inetutils, such as 'route', so we have to
@ -1271,9 +1260,6 @@ network hardware types (plipconfig, slattach) and advanced aspects of IP
configuration (iptunnel, ipmaddr).") configuration (iptunnel, ipmaddr).")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public net-tools-for-tests
(hidden-package (package (inherit net-tools))))
(define-public libcap (define-public libcap
(package (package
(name "libcap") (name "libcap")

View File

@ -153,8 +153,7 @@ living in the same process.")
"15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr")))) "15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:disallowed-references ,(net-tools-for-tests) '(#:configure-flags
#:configure-flags
(list (list
;; GnuTLS doesn't consult any environment variables to specify ;; GnuTLS doesn't consult any environment variables to specify
;; the location of the system-wide trust store. Instead it has a ;; the location of the system-wide trust store. Instead it has a
@ -188,7 +187,7 @@ living in the same process.")
"debug" "debug"
"doc")) ;4.1 MiB of man pages "doc")) ;4.1 MiB of man pages
(native-inputs (native-inputs
`(("net-tools" ,net-tools-for-tests) `(("net-tools" ,net-tools)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("which" ,which))) ("which" ,which)))
(inputs (inputs