summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/packages/acl.scm5
-rw-r--r--gnu/packages/attr.scm5
-rw-r--r--gnu/packages/cdrom.scm4
-rw-r--r--gnu/packages/fdisk.scm5
-rw-r--r--gnu/packages/gettext.scm9
-rw-r--r--gnu/packages/gkrellm.scm5
-rw-r--r--gnu/packages/glib.scm7
-rw-r--r--gnu/packages/gnunet.scm5
-rw-r--r--gnu/packages/grub.scm4
-rw-r--r--gnu/packages/linux.scm7
-rw-r--r--gnu/packages/maths.scm5
-rw-r--r--gnu/packages/nano.scm5
-rw-r--r--gnu/packages/parted.scm5
-rw-r--r--gnu/packages/system.scm5
-rw-r--r--gnu/packages/version-control.scm7
-rw-r--r--gnu/packages/vpn.scm5
-rw-r--r--gnu/packages/w3m.scm5
-rw-r--r--gnu/packages/wget.scm5
-rw-r--r--gnu/packages/xorg.scm7
19 files changed, 48 insertions, 57 deletions
diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index dde9ac4f34..37c0b71dc9 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -20,8 +20,7 @@
#:use-module (guix licenses)
#:use-module (gnu packages attr)
#:use-module (gnu packages perl)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
@@ -62,7 +61,7 @@
'()
`(("perl" ,perl)))))
(native-inputs
- `(("gettext" ,guix:gettext)))
+ `(("gettext" ,gnu-gettext)))
(home-page
"http://savannah.nongnu.org/projects/acl")
diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm
index 3108a9072a..f4f6c46642 100644
--- a/gnu/packages/attr.scm
+++ b/gnu/packages/attr.scm
@@ -20,8 +20,7 @@
(define-module (gnu packages attr)
#:use-module (guix licenses)
#:use-module (gnu packages perl)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu))
@@ -75,7 +74,7 @@
'()
`(("perl" ,perl))))
(native-inputs
- `(("gettext" ,guix:gettext)))
+ `(("gettext" ,gnu-gettext)))
(home-page "http://savannah.nongnu.org/projects/attr/")
(synopsis "Library and tools for manipulating extended attributes")
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 49840ad69f..4580af807b 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -25,7 +25,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages compression)
- #:use-module ((gnu packages gettext) #:renamer (symbol-prefix-proc 'gnu:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages gtk)
#:use-module (gnu packages help2man)
#:use-module (gnu packages ncurses)
@@ -179,7 +179,7 @@ reconstruction capability.")
"0pm039a78h7m9vvjmmjfkl05ii6qdmfhvbypxjbc7j5w82y66is4"))))
(build-system gnu-build-system)
(inputs
- `(("gettext" ,gnu:gettext)
+ `(("gettext" ,gnu-gettext)
("gtk+" ,gtk+-2)
("pkg-config" ,pkg-config)
("which" ,which)))
diff --git a/gnu/packages/fdisk.scm b/gnu/packages/fdisk.scm
index dca77c4d6e..8272c45aab 100644
--- a/gnu/packages/fdisk.scm
+++ b/gnu/packages/fdisk.scm
@@ -18,8 +18,7 @@
(define-module (gnu packages fdisk)
#:use-module ((guix licenses) #:select (gpl3+))
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages guile)
#:use-module (gnu packages linux)
#:use-module (gnu packages parted)
@@ -41,7 +40,7 @@
"04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"))))
(build-system gnu-build-system)
(inputs
- `(("gettext" ,guix:gettext)
+ `(("gettext" ,gnu-gettext)
("guile" ,guile-1.8)
("util-linux" ,util-linux)
("parted" ,parted)))
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 7edbfa023c..6b056055b8 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -24,7 +24,14 @@
#:use-module (guix build-system gnu)
#:use-module (gnu packages xml))
-(define-public gettext
+;; Use that name to avoid clashes with Guile's 'gettext' procedure.
+;;
+;; We used to resort to #:renamer on the user side, but that prevented
+;; circular dependencies involving (gnu packages gettext). This is because
+;; 'resolve-interface' (as of Guile 2.0.9) iterates eagerly over the used
+;; module when there's a #:renamer, and that module may be empty at that point
+;; in case or circular dependencies.
+(define-public gnu-gettext
(package
(name "gettext")
(version "0.18.3.1")
diff --git a/gnu/packages/gkrellm.scm b/gnu/packages/gkrellm.scm
index f53b4fc891..610af418b4 100644
--- a/gnu/packages/gkrellm.scm
+++ b/gnu/packages/gkrellm.scm
@@ -22,8 +22,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'gnu:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages gtk)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xorg))
@@ -42,7 +41,7 @@
"12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"))))
(build-system gnu-build-system)
(inputs
- `(("gettext" ,gnu:gettext)
+ `(("gettext" ,gnu-gettext)
("gtk+" ,gtk+-2)
("libice" ,libice)
("libsm" ,libsm)))
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 61ba0b944e..fc65f304fc 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -29,8 +29,7 @@
#:use-module (gnu packages bison)
#:use-module (gnu packages compression)
#:use-module (gnu packages flex)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libffi)
#:use-module (gnu packages perl)
@@ -124,7 +123,7 @@ shared NFS home directories.")
"doc")) ; 20 MiB of GTK-Doc reference
(inputs
`(("coreutils" ,coreutils)
- ("gettext" ,guix:gettext)
+ ("gettext" ,gnu-gettext)
("libffi" ,libffi)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
@@ -224,7 +223,7 @@ bindings to call into the C library.")
(propagated-inputs
`(;; Propagate gettext because users expect it to be there, and so does
;; the `intltool-update' script.
- ("gettext" ,guix:gettext)
+ ("gettext" ,gnu-gettext)
;; `file' is used by `intltool-update' too.
("file" ,file)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 83278583b7..35be20a3af 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -20,8 +20,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'gnu:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gnutls)
@@ -68,7 +67,7 @@
;; * libsmf
;; * libtidy
(inputs
- `(("gettext" ,gnu:gettext)
+ `(("gettext" ,gnu-gettext)
("flac" ,flac)
("glib" ,glib)
("libjpeg" ,libjpeg)
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index ba1fd8fabc..c24dcaefd9 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -24,7 +24,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages flex)
#:use-module (gnu packages bison)
- #:use-module ((gnu packages gettext) #:renamer (symbol-prefix-proc 'gnu:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages linux)
#:use-module (gnu packages qemu)
@@ -84,7 +84,7 @@
%standard-phases)))
(inputs
`(;; ("lvm2" ,lvm2)
- ("gettext" ,gnu:gettext)
+ ("gettext" ,gnu-gettext)
("freetype" ,freetype)
;; ("libusb" ,libusb)
("ncurses" ,ncurses)))
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index eab4280324..7176c37a87 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -30,8 +30,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages algebra)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'g:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages attr)
#:use-module (gnu packages xml)
@@ -514,7 +513,7 @@ MIDI functionality to the Linux-based operating system.")
("ncurses" ,ncurses)
("alsa-lib" ,alsa-lib)
("xmlto" ,xmlto)
- ("gettext" ,g:gettext)))
+ ("gettext" ,gnu-gettext)))
(home-page "http://www.alsa-project.org/")
(synopsis "Utilities for the Advanced Linux Sound Architecture (ALSA)")
(description
@@ -677,7 +676,7 @@ manpages.")
(sha256
(base32
"0p93lsqx23v5fv4hpbrydmfvw1ha2rgqpn2zqbs2jhxkzhjc030p"))))))
- (native-inputs `(("gettext" ,g:gettext)))
+ (native-inputs `(("gettext" ,gnu-gettext)))
(synopsis "Tools for controlling the network subsystem in Linux")
(description
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 2531285048..c1c78d5ce3 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -27,8 +27,7 @@
#:use-module (guix build-system gnu)
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'gnu:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gtk)
#:use-module (gnu packages multiprecision)
@@ -140,7 +139,7 @@ LP/MIP solver is included in the package.")
(inputs
`(("cairo" ,cairo)
("fontconfig" ,fontconfig)
- ("gettext" ,gnu:gettext)
+ ("gettext" ,gnu-gettext)
("gsl" ,gsl)
("libxml2" ,libxml2)
("pango" ,pango)
diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm
index c936ca552c..662cf4184f 100644
--- a/gnu/packages/nano.scm
+++ b/gnu/packages/nano.scm
@@ -18,8 +18,7 @@
(define-module (gnu packages nano)
#:use-module (guix licenses)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages ncurses)
#:use-module (guix packages)
#:use-module (guix download)
@@ -39,7 +38,7 @@
"1s3b21h5p7r8xafw0gahswj16ai6k2vnjhmd15b491hl0x494c7z"))))
(build-system gnu-build-system)
(inputs
- `(("gettext" ,guix:gettext)
+ `(("gettext" ,gnu-gettext)
("ncurses" ,ncurses)))
(home-page "http://www.nano-editor.org/")
(synopsis "Small, user-friendly console text editor")
diff --git a/gnu/packages/parted.scm b/gnu/packages/parted.scm
index 9d835d6b6c..25f021b6fd 100644
--- a/gnu/packages/parted.scm
+++ b/gnu/packages/parted.scm
@@ -22,8 +22,7 @@
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages check)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages linux)
#:use-module (gnu packages readline))
@@ -54,7 +53,7 @@
(inputs
;; XXX: add 'lvm2'.
`(("check" ,check)
- ("gettext" ,guix:gettext)
+ ("gettext" ,gnu-gettext)
("readline" ,readline)
("util-linux" ,util-linux)))
(home-page "http://www.gnu.org/software/parted/")
diff --git a/gnu/packages/system.scm b/gnu/packages/system.scm
index 9c06e6b61e..2f1eab3806 100644
--- a/gnu/packages/system.scm
+++ b/gnu/packages/system.scm
@@ -28,8 +28,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages linux)
#:use-module (gnu packages guile)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'g:))
+ #:use-module (gnu packages gettext)
#:use-module ((gnu packages base)
#:select (tar))
#:use-module ((gnu packages compression)
@@ -76,7 +75,7 @@ is based on GNU Guile.")
"1b4hfqv23l87cb37fxwzfk2sgspkyxpr3ig2hsd23hr6mm982j7z"))))
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ; There are no tests.
- (native-inputs `(("gettext" ,g:gettext)))
+ (native-inputs `(("gettext" ,gnu-gettext)))
(home-page "http://projects.gw-computing.net/projects/dfc")
(synopsis "Display file system space usage using graphs and colors")
(description
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cc6e3d3111..6c0328556e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -26,8 +26,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build utils)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages apr)
#:use-module (gnu packages curl)
#:use-module (gnu packages nano)
@@ -58,7 +57,7 @@
(inputs
;; Note: 'tools/packaging/lp-upload-release' and 'tools/weavemerge.sh'
;; require Zsh.
- `(("gettext" ,guix:gettext)))
+ `(("gettext" ,gnu-gettext)))
(arguments
`(#:tests? #f ; no test target
#:python ,python-2)) ; Python 3 apparently not yet supported, see
@@ -87,7 +86,7 @@ from a command line or use a GUI application.")
(inputs
`(("curl" ,curl)
("expat" ,expat)
- ("gettext" ,guix:gettext)
+ ("gettext" ,gnu-gettext)
("openssl" ,openssl)
("perl" ,perl)
("python" ,python-2) ; CAVEAT: incompatible with python-3 according to INSTALL
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 0b733550be..dbdfa227e9 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -24,8 +24,7 @@
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'gnu:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages openssl)
#:use-module (gnu packages perl)
@@ -81,7 +80,7 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.")
"1rd8pap455wzkx19i0sy3cqap524b6fwcjvqynxp6lhm01di4bd6"))))
(build-system gnu-build-system)
(inputs
- `(("gettext" ,gnu:gettext)
+ `(("gettext" ,gnu-gettext)
("libxml2" ,libxml2)
("openssl" ,openssl)
("pkg-config" ,pkg-config)
diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm
index b5122d4f23..64fa78ab1b 100644
--- a/gnu/packages/w3m.scm
+++ b/gnu/packages/w3m.scm
@@ -18,8 +18,7 @@
(define-module (gnu packages w3m)
#:use-module ((guix licenses) #:select (x11-style))
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages compression)
#:use-module (gnu packages ncurses)
@@ -61,7 +60,7 @@
(("@PERL@") (which "perl"))))
%standard-phases)))
(inputs
- `(("gettext" ,guix:gettext)
+ `(("gettext" ,gnu-gettext)
("libgc" ,libgc)
("ncurses" ,ncurses)
("openssl" ,openssl)
diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm
index ab7170a73c..29bb725d3b 100644
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -18,8 +18,7 @@
(define-module (gnu packages wget)
#:use-module (guix licenses)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'guix:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages gnutls)
#:use-module (gnu packages perl)
#:use-module (guix packages)
@@ -42,7 +41,7 @@
(inputs
`(("gnutls" ,gnutls)
("perl" ,perl)
- ("gettext" ,guix:gettext)))
+ ("gettext" ,gnu-gettext)))
(home-page "http://www.gnu.org/software/wget/")
(synopsis "Non-interactive command-line utility for downloading files")
(description
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 8ff1532879..3a53fdf3a6 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -26,8 +26,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
- #:use-module ((gnu packages gettext)
- #:renamer (symbol-prefix-proc 'gnu:))
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gperf)
@@ -1303,7 +1302,7 @@ tracking.")
"0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6"))))
(build-system gnu-build-system)
(inputs
- `(("gettext" ,gnu:gettext)
+ `(("gettext" ,gnu-gettext)
("libxt" ,libxt)
("xproto" ,xproto)
("libxext" ,libxext)
@@ -3236,7 +3235,7 @@ tracking.")
"1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892"))))
(build-system gnu-build-system)
(inputs
- `(("gettext" ,gnu:gettext)
+ `(("gettext" ,gnu-gettext)
("intltool" ,intltool)
("libx11" ,libx11)
("pkg-config" ,pkg-config)
generated by cgit v1.2.3 (git 2.25.4) at 2024-11-06 20:51:36 +0000