~ruther/guix-local: Use #:prefix instead of #:renamer with 'symbol-prefix-proc'.

61 files changed, 62 insertions(+), 116 deletions(-)

M gnu/packages/abiword.scm
M gnu/packages/admin.scm
M gnu/packages/aidc.scm
M gnu/packages/backup.scm
M gnu/packages/bittorrent.scm
M gnu/packages/boost.scm
M gnu/packages/compression.scm
M gnu/packages/cryptsetup.scm
M gnu/packages/curl.scm
M gnu/packages/cyrus-sasl.scm
M gnu/packages/dc.scm
M gnu/packages/emacs.scm
M gnu/packages/fonts.scm
M gnu/packages/fontutils.scm
M gnu/packages/geeqie.scm
M gnu/packages/ghostscript.scm
M gnu/packages/gimp.scm
M gnu/packages/gkrellm.scm
M gnu/packages/gl.scm
M gnu/packages/glib.scm
M gnu/packages/gnome.scm
M gnu/packages/gnunet.scm
M gnu/packages/gnupg.scm
M gnu/packages/gnutls.scm
M gnu/packages/gnuzilla.scm
M gnu/packages/gsasl.scm
M gnu/packages/gtk.scm
M gnu/packages/gv.scm
M gnu/packages/image.scm
M gnu/packages/indent.scm
M gnu/packages/inkscape.scm
M gnu/packages/lesstif.scm
M gnu/packages/links.scm
M gnu/packages/lisp.scm
M gnu/packages/lsh.scm
M gnu/packages/lsof.scm
M gnu/packages/maths.scm
M gnu/packages/mp3.scm
M gnu/packages/openssl.scm
M gnu/packages/ots.scm
M gnu/packages/pciutils.scm
M gnu/packages/pcre.scm
M gnu/packages/pdf.scm
M gnu/packages/pulseaudio.scm
M gnu/packages/python.scm
M gnu/packages/slim.scm
M gnu/packages/ssh.scm
M gnu/packages/texlive.scm
M gnu/packages/vim.scm
M gnu/packages/vpn.scm
M gnu/packages/web.scm
M gnu/packages/wv.scm
M gnu/packages/xiph.scm
M gnu/packages/xml.scm
M gnu/packages/xorg.scm
M gnu/packages/yasm.scm
M gnu/packages/zip.scm
M guix/build/cmake-build-system.scm
M guix/build/perl-build-system.scm
M guix/build/python-build-system.scm
M guix/download.scm

M gnu/packages/abiword.scm => gnu/packages/abiword.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages abiword)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/admin.scm => gnu/packages/admin.scm +2 -4

@@ 36,10 36,8 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages tcl)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'c:))
-  #:use-module ((gnu packages openssl)
-                #:renamer (symbol-prefix-proc 'o:))
+  #:use-module ((gnu packages compression) #:prefix c:)
+  #:use-module ((gnu packages openssl) #:prefix o:)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages glib)

M gnu/packages/aidc.scm => gnu/packages/aidc.scm +1 -2

@@ 18,8 18,7 @@
 
 (define-module (gnu packages aidc)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (gnu packages pkg-config)

M gnu/packages/backup.scm => gnu/packages/backup.scm +1 -2

@@ 18,8 18,7 @@
 
 (define-module (gnu packages backup)
   #:use-module (guix packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix download)
   #:use-module (guix build utils)
   #:use-module (guix build-system gnu)

M gnu/packages/bittorrent.scm => gnu/packages/bittorrent.scm +1 -2

@@ 20,8 20,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (gnu packages openssl)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages curl)

M gnu/packages/boost.scm => gnu/packages/boost.scm +1 -2

@@ 18,8 18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages boost)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/compression.scm => gnu/packages/compression.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages compression)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/cryptsetup.scm => gnu/packages/cryptsetup.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages cryptsetup)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/curl.scm => gnu/packages/curl.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages curl)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/cyrus-sasl.scm => gnu/packages/cyrus-sasl.scm +1 -2

@@ 22,8 22,7 @@
   #:use-module (gnu packages gdbm)
   #:use-module (gnu packages mit-krb5)
   #:use-module (gnu packages openssl)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))

M gnu/packages/dc.scm => gnu/packages/dc.scm +1 -2

@@ 27,8 27,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses)
-  #:renamer (symbol-prefix-proc 'license:)))
+  #:use-module ((guix licenses) #:prefix license:))
 
 (define-public ncdc
   (package

M gnu/packages/emacs.scm => gnu/packages/emacs.scm +1 -2

@@ 41,8 41,7 @@
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages wget)
   #:use-module (gnu packages autotools)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'compression:))
+  #:use-module ((gnu packages compression) #:prefix compression:)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages glib)
   #:use-module (guix utils)

M gnu/packages/fonts.scm => gnu/packages/fonts.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages fonts)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/fontutils.scm => gnu/packages/fontutils.scm +1 -1

@@ 22,7 22,7 @@
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xml)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))

M gnu/packages/geeqie.scm => gnu/packages/geeqie.scm +1 -2

@@ 19,8 19,7 @@
 (define-module (gnu packages geeqie)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages glib)

M gnu/packages/ghostscript.scm => gnu/packages/ghostscript.scm +1 -1

@@ 25,7 25,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages tcl)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))

M gnu/packages/gimp.scm => gnu/packages/gimp.scm +1 -2

@@ 19,8 19,7 @@
 (define-module (gnu packages gimp)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages glib)

M gnu/packages/gkrellm.scm => gnu/packages/gkrellm.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gkrellm)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/gl.scm => gnu/packages/gl.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gl)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/glib.scm => gnu/packages/glib.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages glib)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +1 -2

@@ 18,8 18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gnome)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/gnunet.scm => gnu/packages/gnunet.scm +1 -2

@@ 41,8 41,7 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xiph)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))

M gnu/packages/gnupg.scm => gnu/packages/gnupg.scm +1 -2

@@ 27,8 27,7 @@
   #:use-module (gnu packages pth)
   #:use-module (gnu packages python)
   #:use-module (gnu packages readline)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((gnu packages compression) #:prefix guix:)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages pkg-config)

M gnu/packages/gnutls.scm => gnu/packages/gnutls.scm +1 -2

@@ 22,8 22,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((gnu packages compression) #:prefix guix:)
   #:use-module (gnu packages)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages guile)

M gnu/packages/gnuzilla.scm => gnu/packages/gnuzilla.scm +1 -2

@@ 19,8 19,7 @@
 
 (define-module (gnu packages gnuzilla)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/gsasl.scm => gnu/packages/gsasl.scm +1 -2

@@ 18,8 18,7 @@
 
 (define-module (gnu packages gsasl)
   #:use-module (gnu packages)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((gnu packages compression) #:prefix guix:)
   #:use-module (gnu packages gnutls)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages nettle)

M gnu/packages/gtk.scm => gnu/packages/gtk.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gtk)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/gv.scm => gnu/packages/gv.scm +1 -1

@@ 23,7 23,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xorg)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))

M gnu/packages/image.scm => gnu/packages/image.scm +1 -1

@@ 23,7 23,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages ghostscript)         ;lcms
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/indent.scm => gnu/packages/indent.scm +1 -2

@@ 19,8 19,7 @@
 
 (define-module (gnu packages indent)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))

M gnu/packages/inkscape.scm => gnu/packages/inkscape.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages inkscape)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/lesstif.scm => gnu/packages/lesstif.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages lesstif)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/links.scm => gnu/packages/links.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages links)
-  #:use-module ((guix licenses) 
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)

M gnu/packages/lisp.scm => gnu/packages/lisp.scm +1 -2

@@ 18,8 18,7 @@
 
 (define-module (gnu packages lisp)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages texinfo)

M gnu/packages/lsh.scm => gnu/packages/lsh.scm +1 -2

@@ 25,8 25,7 @@
   #:use-module (gnu packages m4)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages nettle)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((gnu packages compression) #:prefix guix:)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages gperf)

M gnu/packages/lsof.scm => gnu/packages/lsof.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages lsof)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/maths.scm => gnu/packages/maths.scm +1 -2

@@ 21,8 21,7 @@
 
 (define-module (gnu packages maths)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)

M gnu/packages/mp3.scm => gnu/packages/mp3.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages mp3)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages cdrom)

M gnu/packages/openssl.scm => gnu/packages/openssl.scm +1 -1

@@ 20,7 20,7 @@
 (define-module (gnu packages openssl)
   #:use-module (gnu packages)
   #:use-module (gnu packages perl)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))

M gnu/packages/ots.scm => gnu/packages/ots.scm +1 -2

@@ 26,8 26,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:)))
+  #:use-module ((guix licenses) #:prefix license:))
 
 (define-public ots
   (package

M gnu/packages/pciutils.scm => gnu/packages/pciutils.scm +1 -2

@@ 19,8 19,7 @@
 (define-module (gnu packages pciutils)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages pkg-config)

M gnu/packages/pcre.scm => gnu/packages/pcre.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages pcre)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages readline)
   #:use-module (guix packages)

M gnu/packages/pdf.scm => gnu/packages/pdf.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages pdf)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/pulseaudio.scm => gnu/packages/pulseaudio.scm +1 -2

@@ 20,8 20,7 @@
 (define-module (gnu packages pulseaudio)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)

M gnu/packages/python.scm => gnu/packages/python.scm +1 -2

@@ 25,8 25,7 @@
                 #:select (asl2.0 bsd-3 bsd-2 bsd-style cc0 expat x11 x11-style
                           gpl2 gpl2+ gpl3+ lgpl2.0+ lgpl2.1+
                           psfl public-domain))
-  #:use-module ((guix licenses) #:select (zlib)
-                                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:select (zlib) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gdbm)

M gnu/packages/slim.scm => gnu/packages/slim.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages slim)
-  #:use-module ((guix licenses)
-		#:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system cmake)

M gnu/packages/ssh.scm => gnu/packages/ssh.scm +1 -2

@@ 18,8 18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages ssh)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages groff)

M gnu/packages/texlive.scm => gnu/packages/texlive.scm +1 -2

@@ 18,8 18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages texlive)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/vim.scm => gnu/packages/vim.scm +1 -1

@@ 17,7 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages vim)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/vpn.scm => gnu/packages/vpn.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages vpn)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/web.scm => gnu/packages/web.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages web)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)

M gnu/packages/wv.scm => gnu/packages/wv.scm +1 -1

@@ 26,7 26,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:)))
+  #:use-module ((guix licenses) #:prefix license:))
 
 (define-public wv
   (package

M gnu/packages/xiph.scm => gnu/packages/xiph.scm +1 -2

@@ 31,8 31,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pulseaudio)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/xml.scm => gnu/packages/xml.scm +1 -2

@@ 24,8 24,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages web)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/xorg.scm => gnu/packages/xorg.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages xorg)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/yasm.scm => gnu/packages/yasm.scm +1 -2

@@ 18,8 18,7 @@
 
 (define-module (gnu packages yasm)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M gnu/packages/zip.scm => gnu/packages/zip.scm +1 -2

@@ 18,8 18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages zip)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)

M guix/build/cmake-build-system.scm => guix/build/cmake-build-system.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix build cmake-build-system)
-  #:use-module ((guix build gnu-build-system)
-                #:renamer (symbol-prefix-proc 'gnu:))
+  #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
   #:use-module (ice-9 match)
   #:export (%standard-phases

M guix/build/perl-build-system.scm => guix/build/perl-build-system.scm +1 -2

@@ 17,8 17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix build perl-build-system)
-  #:use-module ((guix build gnu-build-system)
-                #:renamer (symbol-prefix-proc 'gnu:))
+  #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
   #:use-module (ice-9 match)
   #:export (%standard-phases

M guix/build/python-build-system.scm => guix/build/python-build-system.scm +1 -2

@@ 19,8 19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix build python-build-system)
-  #:use-module ((guix build gnu-build-system)
-                #:renamer (symbol-prefix-proc 'gnu:))
+  #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
   #:use-module (ice-9 match)
   #:use-module (ice-9 ftw)

M guix/download.scm => guix/download.scm +1 -1

@@ 22,7 22,7 @@
   #:use-module (guix derivations)
   #:use-module (guix packages)
   #:use-module ((guix store) #:select (derivation-path? add-to-store))
-  #:use-module ((guix build download) #:renamer (symbol-prefix-proc 'build:))
+  #:use-module ((guix build download) #:prefix build:)
   #:use-module (guix monads)
   #:use-module (guix gexp)
   #:use-module (guix utils)