Alex Kost wrote:
> There is a thing that shouldn't be missed: there are some packages (like
> 'steghide' or 'tomb') in master (and are not presented in core-updates)
> that use 'gnu-gettext'. So when core-updates will be merged into master
> next time, we should make a commit to change these packages to use
> 'gettext-minimal' instead (I'm going to remind about it when the time
> will come).
The original message:
<http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02173.html>.
So the attached patch is to finish the job, i.e. to update the left
packages to use 'gettext-minimal'.
>From 7549a8cefa60af45a154081b0ccb9beaf0160c5d Mon Sep 17 00:00:00 2001
From: Alex Kost
Date: Fri, 18 Nov 2016 20:26:08 +0300
Subject: [PATCH] gnu: packages: Use gettext-minimal.
* gnu/packages/crypto.scm (tomb): Use 'gettext-minimal' instead of
'gnu-gettext'.
* gnu/packages/emacs.scm (m17n-db): Likewise.
* gnu/packages/ftp.scm (weex): Likewise.
* gnu/packages/games.scm (chromium-bsu): Likewise.
* gnu/packages/image.scm (steghide): Likewise.
* gnu/packages/linux.scm (radeontop): Likewise.
* gnu/packages/mpd.scm (sonata): Likewise.
* gnu/packages/networking.scm (whois): Likewise.
* gnu/packages/package-management.scm (guix-0.11.0): Likewise.
* gnu/packages/psyc.scm (psyclpc): Likewise.
* gnu/packages/syndication.scm (newsbeuter): Likewise.
* gnu/packages/vim.scm (vim-full): Likewise.
---
gnu/packages/crypto.scm | 2 +-
gnu/packages/emacs.scm | 2 +-
gnu/packages/ftp.scm| 2 +-
gnu/packages/games.scm | 2 +-
gnu/packages/image.scm | 2 +-
gnu/packages/linux.scm | 2 +-
gnu/packages/mpd.scm| 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/package-management.scm | 2 +-
gnu/packages/psyc.scm | 2 +-
gnu/packages/syndication.scm| 2 +-
gnu/packages/vim.scm| 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 3fcb30c..c7445a1 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -329,7 +329,7 @@ no man page, refer to the home page for usage details.")
("gnupg" ,gnupg)
("cryptsetup" ,cryptsetup)
("e2fsprogs" ,e2fsprogs) ;for mkfs.ext4
- ("gettext" ,gnu-gettext) ;used at runtime
+ ("gettext" ,gettext-minimal) ;used at runtime
("mlocate" ,mlocate)
("pinentry" ,pinentry)
("qrencode" ,qrencode)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a065959..7412aab 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -3298,7 +3298,7 @@ extensibility.")
(base32 "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2"
(build-system gnu-build-system)
(inputs
- `(("gettext" ,gnu-gettext)))
+ `(("gettext" ,gettext-minimal)))
(arguments
`(#:configure-flags
(list (string-append "--with-charmaps="
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index eb622dd..7d3cae6 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -142,7 +142,7 @@ FTP browser, as well as non-interactive commands such as 'ncftpput' and
(native-inputs
`(("automake" ,automake)
("autoconf" ,autoconf)
- ("gettext" ,gnu-gettext)))
+ ("gettext" ,gettext-minimal)))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e8f848a..d6e64c4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2575,7 +2575,7 @@ in strikes against the evil corporation.")
"0jk2w5b6s6nkzri585bbz16cif2fhqcnl5l1mq3rd98r9nil3hd1"
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
-(inputs `(("gettext" ,gnu-gettext)
+(inputs `(("gettext" ,gettext-minimal)
("glu" ,glu)
("quesoglc" ,quesoglc)
("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 8f08fad..df9f453 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -947,7 +947,7 @@ differences in file encoding, image quality, and other small variations.")
(patches (list (search-patch "steghide-fixes.patch")
(build-system gnu-build-system)
(native-inputs
- `(("gettext" ,gnu-gettext)
+ `(("gettext" ,gettext-minimal)
("libtool" ,libtool)
("perl" ,perl)))
