diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-23 16:44:22 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-23 18:52:29 -0400 |
| commit | b5b73a8269eb46064d8c85c4ba189b6914ac06b6 (patch) | |
| tree | 20620c6af5bd7ce98fbaa711d4f1de236aec43f7 | |
| parent | c3f16c554e9731276f17844d545e92fb6bbd56a5 (diff) | |
Use #:prefix instead of #:renamer with 'symbol-prefix-proc'.
* gnu/packages/abiword.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm,
gnu/packages/backup.scm, gnu/packages/bittorrent.scm,
gnu/packages/boost.scm, gnu/packages/compression.scm,
gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
gnu/packages/cyrus-sasl.scm, gnu/packages/dc.scm, gnu/packages/emacs.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/geeqie.scm,
gnu/packages/ghostscript.scm, gnu/packages/gimp.scm,
gnu/packages/gkrellm.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gnutls.scm, gnu/packages/gnuzilla.scm, gnu/packages/gsasl.scm,
gnu/packages/gtk.scm, gnu/packages/gv.scm, gnu/packages/image.scm,
gnu/packages/indent.scm, gnu/packages/inkscape.scm,
gnu/packages/lesstif.scm, gnu/packages/links.scm, gnu/packages/lisp.scm,
gnu/packages/lsh.scm, gnu/packages/lsof.scm, gnu/packages/maths.scm,
gnu/packages/mp3.scm, gnu/packages/openssl.scm, gnu/packages/ots.scm,
gnu/packages/pciutils.scm, gnu/packages/pcre.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/slim.scm,
gnu/packages/ssh.scm, gnu/packages/texlive.scm, gnu/packages/vim.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wv.scm,
gnu/packages/xiph.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm,
gnu/packages/yasm.scm, gnu/packages/zip.scm,
guix/build/cmake-build-system.scm, guix/build/perl-build-system.scm,
guix/build/python-build-system.scm, guix/download.scm: Replaces uses of
#:renamer and 'symbol-prefix-proc' with #:prefix.
61 files changed, 62 insertions, 116 deletions
diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index 82a289e712..a76b16c5af 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -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) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ffeab07bde..f6ff32c8a2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -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) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 393d2c6fb4..d5428d30aa 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -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) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index d6e106071f..6fd7306d6c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -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) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 496120a06d..8b4388668e 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -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) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index a77f1393d9..f0feeb73c0 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -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) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index dbaed6155d..217ddef1c0 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -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) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 781147cc35..efb7e1f2da 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -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) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 727c57d611..f77c5401d4 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -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) diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index 0c92cc36a1..9f70988814 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -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)) diff --git a/gnu/packages/dc.scm b/gnu/packages/dc.scm index 0e65d886d0..4692244de6 100644 --- a/gnu/packages/dc.scm +++ b/gnu/packages/dc.scm @@ -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 diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a788bd8fde..6e42d0ac67 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -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) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 7802d364dd..7c95666c53 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -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) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a67b0a2230..3b835760ce 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -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)) diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm index 7d8bb67556..3bc25ce790 100644 --- a/gnu/packages/geeqie.scm +++ b/gnu/packages/geeqie.scm @@ -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) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 13997cd4e6..1d12075fcc 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -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)) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 399c99bcdf..8fe4f767ed 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -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) diff --git a/gnu/packages/gkrellm.scm b/gnu/packages/gkrellm.scm index 610af418b4..31bca00889 100644 --- a/gnu/packages/gkrellm.scm +++ b/gnu/packages/gkrellm.scm @@ -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) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6f92cac55e..a65639bee3 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -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) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 239715ecc7..2712ef0c8b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -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) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cf690da25a..bbb3053284 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -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) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index d5a1930bbe..927d201d49 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -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)) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 326a321ca5..f3f5d97b4b 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -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) diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm index 89fc86d6ad..611c506acc 100644 --- a/gnu/packages/gnutls.scm +++ b/gnu/packages/gnutls.scm @@ -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) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 311ebbee8b..11515d4243 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -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) diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 11f856f3cd..8739c0444e 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -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) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5a72d6736e..4dd389ba47 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -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) diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm index a67137f0c2..f635942119 100644 --- a/gnu/packages/gv.scm +++ b/gnu/packages/gv.scm @@ -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)) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a55a5456af..981d3a8976 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -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) diff --git a/gnu/packages/indent.scm b/gnu/packages/indent.scm index 7d7acba2dc..bd36f7bb44 100644 --- a/gnu/packages/indent.scm +++ b/gnu/packages/indent.scm @@ -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)) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 9c3c9c2f74..b48bedc78d 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -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) diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm index d15549454f..d2ad120531 100644 --- a/gnu/packages/lesstif.scm +++ b/gnu/packages/lesstif.scm @@ -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) diff --git a/gnu/packages/links.scm b/gnu/packages/links.scm index c18f7de1bd..9b9eee5b69 100644 --- a/gnu/packages/links.scm +++ b/gnu/packages/links.scm @@ -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) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c2edaaf0b2..1519ae1422 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -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) diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm index 52d9df4386..1b4dfd051b 100644 --- a/gnu/packages/lsh.scm +++ b/gnu/packages/lsh.scm @@ -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) diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index fc5ddc9cda..3611a456a0 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -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) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index af9feff040..9d721f86e4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -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) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 79ae6eac94..3860601623 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -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) diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm index 77e2860826..a94b7a5c3b 100644 --- a/gnu/packages/openssl.scm +++ b/gnu/packages/openssl.scm @@ -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)) diff --git a/gnu/packages/ots.scm b/gnu/packages/ots.scm index 4404841375..e317245355 100644 --- a/gnu/packages/ots.scm +++ b/gnu/packages/ots.scm @@ -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 diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 2b887f16d8..bf395e33e8 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -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) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index b3f89427e7..94df45499b 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -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) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c3cb755f4d..d6d97c1ea8 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -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) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index b17ee6987f..63f343dc37 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -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) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5195f66394..897e248046 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -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) diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm index b179acfc56..70aab8cc96 100644 --- a/gnu/packages/slim.scm +++ b/gnu/packages/slim.scm @@ -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) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a22468affd..7d7e2fd1c1 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -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) diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm index 57a250cba2..e562b02598 100644 --- a/gnu/packages/texlive.scm +++ b/gnu/packages/texlive.scm @@ -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) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 4a46a1cd7d..66e0f0ed26 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -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) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index f1db433ba9..480d97712b 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -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) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2283d4a50b..57eb89adfc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -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) diff --git a/gnu/packages/wv.scm b/gnu/packages/wv.scm index af8412cbc4..a7f294462b 100644 --- a/gnu/packages/wv.scm +++ b/gnu/packages/wv.scm @@ -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 diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 8259be3f7d..4ddda7051a 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -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) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d070a8d4db..688aa3b07b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -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) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9b5526d3e2..7f12d3a687 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -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) diff --git a/gnu/packages/yasm.scm b/gnu/packages/yasm.scm index a990d08174..8314e22247 100644 --- a/gnu/packages/yasm.scm +++ b/gnu/packages/yasm.scm @@ -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) diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm index 1e1d29e1b7..13dc62c212 100644 --- a/gnu/packages/zip.scm +++ b/gnu/packages/zip.scm @@ -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) diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index 144552e8de..7d60ab7aa9 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -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 diff --git a/guix/build/perl-build-system.scm b/guix/build/perl-build-system.scm index 793b6aacb5..904daf7ac2 100644 --- a/guix/build/perl-build-system.scm +++ b/guix/build/perl-build-system.scm @@ -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 diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 0bb8c4d49d..2f3d04a5d8 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -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) diff --git a/guix/download.scm b/guix/download.scm index c0a7e8c23a..e956e08470 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -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) |