aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/admin.scm
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2015-07-05 18:27:24 +0200
committerAndreas Enge <andreas@enge.fr>2015-07-05 18:27:24 +0200
commitcc2b77dfc715c2133bd0c9e318bd7dc90bfedece (patch)
tree4762c9c5f556f2ffd619d617dc7b83c739456d10 /gnu/packages/admin.scm
parenta7fd7b68a6727ea168ae69893a01d7731e9073cf (diff)
downloadguix-cc2b77dfc715c2133bd0c9e318bd7dc90bfedece.tar
guix-cc2b77dfc715c2133bd0c9e318bd7dc90bfedece.tar.gz
gnu: Move content of openssl module into tls module.
* gnu/packages/openssl.scm (openssl, perl-net-ssleay): Move to... * gnu/packages/tls.scm: ...here. * gnu/packages/openssl.scm: Delete file. * gnu-system.am (GNU_SYSTEM_MODULES): Unregister deleted file. * gnu/packages/{admin.scm, bittorrent.scm, certs.scm, ci.scm, cyrus-sasl.scm, databases.scm, dns.scm, ebook.scm, enlightenment.scm, gnunet.scm, libreoffice.scm, links.scm, mail.scm, messaging.scm, networking.scm, ntp.scm, openldap.scm, package-management.scm, pdf.scm, python.scm, qt.scm, rdesktop.scm, rdf.scm, ruby.scm, ssh.scm, synergy.scm, tor.scm, version-control.scm, video.scm, vpn.scm, w3m.scm, web.scm, weechat.scm, xiph.scm}: Adapt module import.
Diffstat (limited to 'gnu/packages/admin.scm')
-rw-r--r--gnu/packages/admin.scm5
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index bc9214e9d8..58f9ce507d 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -40,7 +40,6 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages tcl)
#:use-module (gnu packages compression)
- #:use-module ((gnu packages openssl) #:prefix o:)
#:use-module (gnu packages tls)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages bison)
@@ -501,7 +500,7 @@ network statistics collection, security monitoring, network debugging, etc.")
"15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"))))
(build-system gnu-build-system)
(inputs `(("libpcap" ,libpcap)
- ("openssl" ,o:openssl)))
+ ("openssl" ,openssl)))
(native-inputs `(("perl" ,perl))) ; for tests
(home-page "http://www.tcpdump.org/")
(synopsis "Network packet analyzer")
@@ -975,7 +974,7 @@ characters can be replaced as well, as can UTF-8 characters.")
(inputs
`(;; ("ntfs" ,ntfs)
("util-linux" ,util-linux)
- ("openssl" ,o:openssl)
+ ("openssl" ,openssl)
("zlib" ,zlib)
("e2fsprogs" ,e2fsprogs)
("libjpeg" ,libjpeg)