diff --git a/gnu-system.am b/gnu-system.am index e6256fdd3f98740a6342c8db1e1d3320c8f7cd07..261a54a608d2d3c6c3ff13ae7ff01f67f8146a45 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 960264bc2d5c7239896b051b324968b747ba0d43..bc9214e9d85f63ef4a0ccdcdc85ca5d0345f20d1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -41,7 +41,7 @@ (define-module (gnu packages admin) #: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 8d86cd6badba83f37bfa7f2cead9c0b68917c739..68302ffa82d512eee17d013e4d276ee12d35c04d 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -30,9 +30,9 @@ (define-module (gnu packages cups) #: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 1e72a57a078f75a5a6c6aa3b9fca90564aa9ecb4..f5cb503f8d41760a5097523fabc9549c88757f85 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -25,7 +25,6 @@ (define-module (gnu packages curl) #: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 @@ (define-module (gnu packages curl) #: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 4692244de691dae907f79c4bf5667679826440c9..de4cda1fad00b4ef1a62b5abc0b9805d2cb730c7 100644 --- a/gnu/packages/dc.scm +++ b/gnu/packages/dc.scm @@ -20,10 +20,10 @@ (define-module (gnu packages dc) #: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 f0c103ab2d6613f8ca7bd56de184cdd1ef151099..1b7fc8b1f0dd1dbe1a84283918def8643f6b136b 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 2502f2935d1ebaf64f4c8e06be54ccecad5ee494..d8d6e7ba79d2e51bf8d4534f2588faead832dbd6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -33,7 +33,7 @@ (define-module (gnu packages emacs) #: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 790ffc66c2d9b7901cc2a45318e9671f14cf8082..acd69adcd060da3fe16832aa2e9ee280798b4075 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -27,7 +27,7 @@ (define-module (gnu packages ftp) #: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 3882a7a3242f5ce658bd7bc6b206e17c300dfdd3..0ec5ea2e9610afb4778545cc0c2cc8907919a85a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -52,7 +52,6 @@ (define-module (gnu packages gnome) #: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 @@ (define-module (gnu packages gnome) #: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 78279b02431c670505d1d4b44cdd2c7eaf2d9614..162bf83fe5799ea8e7f41a5510be50fff680a80d 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -28,7 +28,6 @@ (define-module (gnu packages gnunet) #: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 @@ (define-module (gnu packages gnunet) #: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 637212afa45a6c0c62e0aa24f142c45d9dc1c039..432409b81f345238460de520e8bfec3357f77b8d 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 @@ (define-module (gnu packages gnupg) #: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 d5de2f2ee8cb39fac4bb24a2bcb3907f92c5e4dd..3caeb1a2008a10b7f47b7c4396b59d93ca3176d1 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 ebca50d34f370e909f4eab25a04006c4b50e0358..713f5d5625864d69f25e0bf045a5e0fd4652bda3 100644 --- a/gnu/packages/lynx.scm +++ b/gnu/packages/lynx.scm @@ -25,8 +25,8 @@ (define-module (gnu packages lynx) #: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 d14fdc761998ee2b31ab46ce0dc69ee37a0a5006..00f31b0d06446bfbbbc2eb2547f9fe1f4cca0527 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -41,7 +41,6 @@ (define-module (gnu packages mail) #: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 @@ (define-module (gnu packages mail) #: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 50d59cfcc53e07f34b351dc35f2dc31e6c6d5d84..a71b112ad3a11dcbac4165e77d7a24eb434b5edb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -35,14 +35,14 @@ (define-module (gnu packages messaging) #: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 3da9df92cce8ca818fa90ee84362eadfd458628d..f0ccf6a31e91eafe16375ae7e138f754037a26e8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -29,7 +29,6 @@ (define-module (gnu packages package-management) #: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 @@ (define-module (gnu packages package-management) #: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 47e78022138621935e3ed060a4f6cc3dd50388b1..30351fb517e2c42874d31c97edbd62d14a44280e 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 e77aecb957d8d081eb08ea72d1732d2910d3f00b..340475c6663a48a85d54ebbc0cb95801487cbe76 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 415ea7a11e32bc6c28f83fd2715a99e3c7badd10..31ce1b39101f6cdcf8f47bb02e78f531ec44bbc7 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 <http://www.gnu.org/licenses/>. -(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 15e6fb6eb3d5c2a8f0d54a9fbcc818d75b711fdf..09f5a89c34eaf8991f9e5d0e88964243620db4ae 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -44,7 +44,6 @@ (define-module (gnu packages version-control) #: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 @@ (define-module (gnu packages version-control) #: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 83434bea36fe5da16550064e7d4f7c464ec345c9..5d1e9fa51e6a59c30e562043316f1eee255e277b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -49,7 +49,6 @@ (define-module (gnu packages video) #: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 @@ (define-module (gnu packages video) #: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 62036d9ef7d1565dfe59572db01b69a7a9fc379a..91448121b44469a50400235c7666df40d68f6757 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -27,11 +27,11 @@ (define-module (gnu packages vpn) #: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 0f3a44b063e061d5676acbc1ec724fca0d48597c..7fbb985527ae1dab92b1b4979d68c7d2197e1256 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -34,7 +34,6 @@ (define-module (gnu packages webkit) #: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 @@ (define-module (gnu packages webkit) #: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 a2e53481c3b308dbae37cb04de5e3bc31df43fea..6976586f4eab2eef85b0f296aee853cdbdb67ab8 100644 --- a/gnu/packages/weechat.scm +++ b/gnu/packages/weechat.scm @@ -31,13 +31,13 @@ (define-module (gnu packages weechat) #: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 0cdb4964fac87df7b48cf9e8d0d0cd569a9a7665..d1413a7e71e66863df78b95fe7deb0dfd427a40a 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 5b0758c6b289ffe61425b15f2d3895027a1093c8..938c8cb7992a566ba7227c665b2721084442c5c3 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -32,7 +32,6 @@ (define-module (gnu packages wine) #: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 @@ (define-module (gnu packages wine) #: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 c4ec33e2d7fd426fd91466f7e0af419fe0812347..0fc51c5501766965764f432e31779e2feaa49631 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -25,9 +25,9 @@ (define-module (gnu packages xml) #: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)