Patchwork gnu: packages: Use gettext-minimal.

login
register
mail settings
Submitter Alex Kost
Date Nov. 18, 2016, 5:47 p.m.
Message ID <87h9747ka2.fsf@gmail.com>
Download mbox | patch
Permalink /patch/17570/
State New
Headers show

Comments

Alex Kost - Nov. 18, 2016, 5:47 p.m.
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'.
Leo Famulari - Nov. 18, 2016, 8:02 p.m.
On Fri, Nov 18, 2016 at 08:47:01PM +0300, Alex Kost wrote:
> 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 <alezost@gmail.com>
> 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.

LGTM. Thanks for taking care of this!
Alex Kost - Nov. 21, 2016, 5:16 p.m.
Leo Famulari (2016-11-18 15:02 -0500) wrote:

> On Fri, Nov 18, 2016 at 08:47:01PM +0300, Alex Kost wrote:
[...]
>> From 7549a8cefa60af45a154081b0ccb9beaf0160c5d Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> 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.
>
> LGTM. Thanks for taking care of this!

Committed, thanks!

Patch

From 7549a8cefa60af45a154081b0ccb9beaf0160c5d Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
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)))                 ;for tests
     (inputs
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9518de4..c84e09e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3128,7 +3128,7 @@  developers.")
                           (string-append "PREFIX=" %output))
        #:tests? #f))                    ; no tests
     (native-inputs
-     `(("gnu-gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("libdrm" ,libdrm)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index f59ef30..d3da5f5 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -301,7 +301,7 @@  interface for the Music Player Daemon.")
                  `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
              #t)))))
     (native-inputs
-     `(("gettext" ,gnu-gettext)))
+     `(("gettext" ,gettext-minimal)))
     (inputs
      `(("python-mpd2" ,python-mpd2)
        ("gtk+" ,gtk+)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index f19cebe..61af703 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -454,7 +454,7 @@  and up to 1 Mbit/s downstream.")
     (inputs
      `(("libidn" ,libidn)))
     (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
        ("perl" ,perl)))
     (synopsis "Improved whois client")
     (description "This whois client is intelligent and can
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 8c8a267..33df607 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -166,7 +166,7 @@ 
                      ;; guix' always contains them.
                      ("autoconf" ,(autoconf-wrapper))
                      ("automake" ,automake)
-                     ("gettext" ,gnu-gettext)
+                     ("gettext" ,gettext-minimal)
                      ("texinfo" ,texinfo)
                      ("graphviz" ,graphviz)
                      ("help2man" ,help2man)))
diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
index a55f78e..03df188 100644
--- a/gnu/packages/psyc.scm
+++ b/gnu/packages/psyc.scm
@@ -212,7 +212,7 @@  including psyced.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("bison" ,bison)
-       ("gnu-gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
        ("help2man" ,help2man)
        ("autoconf" ,autoconf)
        ("automake" ,automake)))
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index f4668de..f434006 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -53,7 +53,7 @@ 
        #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
        #:test-target "test"))
     (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
        ("ruby" ,ruby))) ; for tests
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index b283e97..2026c8a 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -129,7 +129,7 @@  configuration files.")
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
        ("gdk-pixbuf" ,gdk-pixbuf)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
        ("glib" ,glib)
        ("gpm" ,gpm)
        ("gtk" ,gtk+-2)
-- 
2.9.2