03/08: gnu: Remove now unneeded 'localedef' invocations.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 7184b4b1bd839cd4fd0c9630c050c7854174057d
Author: Ludovic Courtès <address@hidden>
Date:   Fri Feb 27 14:49:27 2015 +0100

    gnu: Remove now unneeded 'localedef' invocations.
    
    This is a followup to commit b0fd2bd.
    
    * gnu/packages/gawk.scm (gawk)[arguments] <install-locales>: Add comment
      on why we leave this here.
    * gnu/packages/guile.scm (guile-ncurses)[arguments]: Remove
      'install-locales' phase.
    * gnu/packages/swig.scm (swig)[arguments]: Likewise.
    * gnu/packages/python.scm (python-matplotlib): Remove 'LOCPATH' setting
      and 'localedef' invocation.
      (python-scipy): Likewise.
---
 gnu/packages/gawk.scm   |    3 ++-
 gnu/packages/guile.scm  |   11 +----------
 gnu/packages/python.scm |   12 ------------
 gnu/packages/swig.scm   |   14 +-------------
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm
index e0d3f41..06ecf6a 100644
--- a/gnu/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@ -61,7 +61,8 @@
                  'check 'install-locales
                  (lambda _
                    ;; A bunch of tests require the availability of a UTF-8
-                   ;; locale and otherwise fail.  Give them what they want.
+                   ;; locale and otherwise fail.  Since UTF-8 locales are not
+                   ;; available during bootstrap, create one here.
                    (setenv "LOCPATH" (getcwd))
                    (zero? (system* "localedef" "--no-archive"
                                    "--prefix" (getcwd) "-i" "en_US"
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index f71201b..c29b121 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -261,16 +261,7 @@ many readers as needed).")
                       (("\"libguile-ncurses\"")
                        (format #f "\"~a/lib/libguile-ncurses\""
                                out)))))
-                 (alist-cons-before
-                  'check 'install-locales
-                  (lambda _
-                    ;; One of the tests requires the availability of a UTF-8
-                    ;; locale and otherwise fails.
-                    (setenv "LOCPATH" (getcwd))
-                    (zero? (system* "localedef" "--no-archive"
-                                    "--prefix" (getcwd) "-i" "en_US"
-                                    "-f" "UTF-8" "./en_US.utf8")))
-                  %standard-phases))))
+                 %standard-phases)))
     (home-page "http://www.gnu.org/software/guile-ncurses/";)
     (synopsis "Guile bindings to ncurses")
     (description
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0df91d6..7569770 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2251,12 +2251,6 @@ backend = GTK3Agg~%")))))
                   (info (string-append data "/info"))
                   (html (string-append doc "/html")))
              (with-directory-excursion "doc"
-               ;; Install and set UTF-8 locale to avoid an encoding error.
-               (setenv "LOCPATH" (getcwd))
-               (system* "localedef" "--no-archive"
-                        "--prefix" (getcwd) "-i" "en_US"
-                        "-f" "UTF-8" "./en_US.UTF-8")
-               (setenv "LANG" "en_US.UTF-8")
                ;; Produce pdf in 'A4' format.
                (substitute* (find-files "." "conf\\.py")
                  (("latex_paper_size = 'letter'")
@@ -2349,12 +2343,6 @@ toolkits.")
                   (html (string-append doc "/html"))
                   (pyver ,(string-append "PYVER=")))
              (with-directory-excursion "doc"
-               ;; Install and set UTF-8 locale to avoid an encoding error.
-               (setenv "LOCPATH" (getcwd))
-               (system* "localedef" "--no-archive"
-                        "--prefix" (getcwd) "-i" "en_US"
-                        "-f" "UTF-8" "./en_US.UTF-8")
-               (setenv "LANG" "en_US.UTF-8")
                ;; Fix generation of images for mathematical expressions.
                (substitute* (find-files "source" "conf\\.py")
                  (("pngmath_use_preview = True")
diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index a978dec..bd7978d 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2015 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -54,18 +54,6 @@
               ;; The python part probably never worked and does not seem to
               ;; be needed for currently dependent packages.
 ;;               ("python" ,python-wrapper)))
-    (arguments
-     `(#:phases
-       (alist-cons-before
-        'check 'install-locales
-        (lambda _
-          ;; One of the tests requires the availability of a UTF-8
-          ;; locale and otherwise fails.
-          (setenv "LOCPATH" (getcwd))
-          (zero? (system* "localedef" "--no-archive"
-                          "--prefix" (getcwd) "-i" "en_US"
-                          "-f" "UTF-8" "./en_US.utf8")))
-        %standard-phases)))
     (home-page "http://swig.org/";)
     (synopsis
      "Interface compiler that connects C/C++ code to higher-level languages")