From a7fd7b68a6727ea168ae69893a01d7731e9073cf Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 3 Jul 2015 21:41:22 +0200 Subject: [PATCH] gnu: Rename module gnutls to tls. * gnu/packages/gnutls.scm: Rename to... * gnu/packages/tls.scm: ... this. Change module name accordingly. * gnu/packages/{admin.scm, cups.scm, curl.scm, dc.scm, dns.scm, emacs.scm, ftp.scm, gnome.scm, gnunet.scm, gnupg.scm, gsasl.scm, lynx.scm, mail.scm, messaging.scm, package-management.scm, shishi.scm, task-management.scm, version-control.scm, video.scm, vpn.scm, webkit.scm, weechat.scm, wget.scm, wine.scm, xml.scm}: Adapt module import to new name. * gnu-system.am (GNU_SYSTEM_MODULES): Rename gnutls module to tls. --- gnu-system.am | 2 +- gnu/packages/admin.scm | 2 +- gnu/packages/cups.scm | 4 ++-- gnu/packages/curl.scm | 4 ++-- gnu/packages/dc.scm | 2 +- gnu/packages/dns.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/ftp.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnupg.scm | 2 +- gnu/packages/gsasl.scm | 2 +- gnu/packages/lynx.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/messaging.scm | 4 ++-- gnu/packages/package-management.scm | 4 ++-- gnu/packages/shishi.scm | 2 +- gnu/packages/task-management.scm | 2 +- gnu/packages/{gnutls.scm => tls.scm} | 2 +- gnu/packages/version-control.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- gnu/packages/webkit.scm | 2 +- gnu/packages/weechat.scm | 2 +- gnu/packages/wget.scm | 2 +- gnu/packages/wine.scm | 2 +- gnu/packages/xml.scm | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) rename gnu/packages/{gnutls.scm => tls.scm} (99%) diff --git a/gnu-system.am b/gnu-system.am index e6256fdd3f..261a54a608 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -128,7 +128,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/gnunet.scm \ gnu/packages/gnupg.scm \ gnu/packages/gnustep.scm \ - gnu/packages/gnutls.scm \ gnu/packages/gnuzilla.scm \ gnu/packages/gnu-pw-mgr.scm \ gnu/packages/gperf.scm \ @@ -294,6 +293,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/texlive.scm \ gnu/packages/textutils.scm \ gnu/packages/time.scm \ + gnu/packages/tls.scm \ gnu/packages/tmux.scm \ gnu/packages/tor.scm \ gnu/packages/tre.scm \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 960264bc2d..bc9214e9d8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -41,7 +41,7 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages compression) #:use-module ((gnu packages openssl) #:prefix o:) - #:use-module (gnu packages gnutls) + #:use-module (gnu packages tls) #:use-module (gnu packages gnupg) #:use-module (gnu packages bison) #:use-module (gnu packages flex) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8d86cd6bad..68302ffa82 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -30,9 +30,9 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) - #:use-module (gnu packages gnutls) #:use-module (gnu packages pdf) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls)) (define-public cups-filters (package diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 1e72a57a07..f5cb503f8d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -25,7 +25,6 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) - #:use-module (gnu packages gnutls) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) #:use-module (gnu packages libidn) @@ -33,7 +32,8 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages ssh)) + #:use-module (gnu packages ssh) + #:use-module (gnu packages tls)) (define-public curl (package diff --git a/gnu/packages/dc.scm b/gnu/packages/dc.scm index 4692244de6..de4cda1fad 100644 --- a/gnu/packages/dc.scm +++ b/gnu/packages/dc.scm @@ -20,10 +20,10 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages glib) - #:use-module (gnu packages gnutls) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages databases) + #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index f0c103ab2d..1b7fc8b1f0 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -18,10 +18,10 @@ (define-module (gnu packages dns) #:use-module (gnu packages databases) - #:use-module (gnu packages gnutls) #:use-module (gnu packages linux) #:use-module (gnu packages openssl) #:use-module (gnu packages perl) + #:use-module (gnu packages tls) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2502f2935d..d8d6e7ba79 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -33,7 +33,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages ncurses) #:use-module (gnu packages texinfo) - #:use-module (gnu packages gnutls) + #:use-module (gnu packages tls) #:use-module (gnu packages pkg-config) #:use-module (gnu packages guile) #:use-module (gnu packages xorg) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 790ffc66c2..acd69adcd0 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -27,7 +27,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages gnutls) + #:use-module (gnu packages tls) #:use-module (gnu packages compression)) (define-public lftp diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3882a7a324..0ec5ea2e96 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -52,7 +52,6 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages popt) #:use-module (gnu packages ghostscript) - #:use-module (gnu packages gnutls) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) @@ -69,6 +68,7 @@ #:use-module (gnu packages qt) ; for libxkbcommon #:use-module (gnu packages compression) #:use-module (gnu packages texlive) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages xorg) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 78279b0243..162bf83fe5 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -28,7 +28,6 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) - #:use-module (gnu packages gnutls) #:use-module (gnu packages groff) #:use-module (gnu packages gstreamer) #:use-module (gnu packages libidn) @@ -41,6 +40,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages databases) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xiph) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 637212afa4..432409b81f 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -22,7 +22,6 @@ (define-module (gnu packages gnupg) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages curl) - #:use-module (gnu packages gnutls) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pth) @@ -33,6 +32,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ncurses) + #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index d5de2f2ee8..3caeb1a200 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -19,10 +19,10 @@ (define-module (gnu packages gsasl) #:use-module (gnu packages) #:use-module (gnu packages compression) - #:use-module (gnu packages gnutls) #:use-module (gnu packages libidn) #:use-module (gnu packages nettle) #:use-module (gnu packages shishi) + #:use-module (gnu packages tls) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/lynx.scm b/gnu/packages/lynx.scm index ebca50d34f..713f5d5625 100644 --- a/gnu/packages/lynx.scm +++ b/gnu/packages/lynx.scm @@ -25,8 +25,8 @@ #:use-module (gnu packages perl) #:use-module (gnu packages ncurses) #:use-module (gnu packages libidn) - #:use-module (gnu packages gnutls) #:use-module (gnu packages gnupg) + #:use-module (gnu packages tls) #:use-module (gnu packages zip) #:use-module (gnu packages compression)) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d14fdc7619..00f31b0d06 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -41,7 +41,6 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) - #:use-module (gnu packages gnutls) #:use-module (gnu packages gsasl) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -64,6 +63,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gdb) #:use-module (gnu packages samba) + #:use-module (gnu packages tls) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module ((guix licenses) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 50d59cfcc5..a71b112ad3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -35,14 +35,14 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) - #:use-module (gnu packages gnutls) #:use-module (gnu packages python) #:use-module (gnu packages perl) #:use-module (gnu packages tcl) #:use-module (gnu packages compression) #:use-module (gnu packages check) #:use-module (gnu packages admin) - #:use-module (gnu packages linux)) + #:use-module (gnu packages linux) + #:use-module (gnu packages tls)) (define-public libotr (package diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3da9df92cc..f0ccf6a31e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -29,7 +29,6 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) #:use-module (gnu packages databases) - #:use-module (gnu packages gnutls) #:use-module (gnu packages graphviz) #:use-module (gnu packages pkg-config) #:use-module (gnu packages autotools) @@ -41,7 +40,8 @@ #:use-module (gnu packages man) #:use-module (gnu packages emacs) #:use-module (gnu packages openssl) - #:use-module (gnu packages bdw-gc)) + #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages tls)) (define (boot-guile-uri arch) "Return the URI for the bootstrap Guile tarball for ARCH." diff --git a/gnu/packages/shishi.scm b/gnu/packages/shishi.scm index 47e7802213..30351fb517 100644 --- a/gnu/packages/shishi.scm +++ b/gnu/packages/shishi.scm @@ -21,12 +21,12 @@ (define-module (gnu packages shishi) #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (gnu packages) - #:use-module (gnu packages gnutls) #:use-module (gnu packages gnupg) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages compression) + #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index e77aecb957..340475c666 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -19,9 +19,9 @@ (define-module (gnu packages task-management) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (gnu packages gnutls) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages tls) #:use-module (guix download) #:use-module (guix build-system cmake)) diff --git a/gnu/packages/gnutls.scm b/gnu/packages/tls.scm similarity index 99% rename from gnu/packages/gnutls.scm rename to gnu/packages/tls.scm index 415ea7a11e..31ce1b3910 100644 --- a/gnu/packages/gnutls.scm +++ b/gnu/packages/tls.scm @@ -19,7 +19,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu packages gnutls) +(define-module (gnu packages tls) #:use-module ((guix licenses) #:select (lgpl2.0+ lgpl2.1+ bsd-3)) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 15e6fb6eb3..09f5a89c34 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages groff) #:use-module (gnu packages linux) -;; #:use-module (gnu packages gnutls) #:use-module (gnu packages nano) #:use-module (gnu packages ncurses) #:use-module (gnu packages openssl) @@ -60,6 +59,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) +;; #:use-module (gnu packages tls) #:use-module (gnu packages) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 83434bea36..5d1e9fa51e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -49,7 +49,6 @@ #:use-module (gnu packages glib) #:use-module (gnu packages guile) #:use-module (gnu packages gnupg) - #:use-module (gnu packages gnutls) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages linux) @@ -69,6 +68,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages texlive) #:use-module (gnu packages textutils) + #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 62036d9ef7..91448121b4 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -27,11 +27,11 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) - #:use-module (gnu packages gnutls) #:use-module (gnu packages linux) #:use-module (gnu packages openssl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) #:use-module (gnu packages xml)) (define-public gvpe diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0f3a44b063..7fbb985527 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -34,7 +34,6 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) - #:use-module (gnu packages gnutls) #:use-module (gnu packages gperf) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) @@ -44,6 +43,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages ruby) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) diff --git a/gnu/packages/weechat.scm b/gnu/packages/weechat.scm index a2e53481c3..6976586f4e 100644 --- a/gnu/packages/weechat.scm +++ b/gnu/packages/weechat.scm @@ -31,13 +31,13 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages aspell) #:use-module (gnu packages curl) - #:use-module (gnu packages gnutls) #:use-module (gnu packages guile) #:use-module (gnu packages openssl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages autogen) #:use-module (gnu packages autotools) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 0cdb4964fa..d1413a7e71 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -19,12 +19,12 @@ (define-module (gnu packages wget) #:use-module (guix licenses) - #:use-module (gnu packages gnutls) #:use-module (gnu packages libidn) #:use-module (gnu packages python) #:use-module (gnu packages perl) #:use-module (gnu packages web) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 5b0758c6b2..938c8cb799 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -32,7 +32,6 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) - #:use-module (gnu packages gnutls) #:use-module (gnu packages linux) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -42,6 +41,7 @@ #:use-module (gnu packages photo) #:use-module (gnu packages samba) #:use-module (gnu packages scanner) + #:use-module (gnu packages tls) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index c4ec33e2d7..0fc51c5501 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -25,9 +25,9 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) - #:use-module (gnu packages gnutls) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) -- 2.20.1