nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2015-02-27 14:49:27 +01:00
parent da6dd842d0
commit 7184b4b1bd
4 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/gawk.scm
View File

@ -61,7 +61,8 @@
'check 'install-locales 'check 'install-locales
(lambda _ (lambda _
;; A bunch of tests require the availability of a UTF-8 ;; 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)) (setenv "LOCPATH" (getcwd))
(zero? (system* "localedef" "--no-archive" (zero? (system* "localedef" "--no-archive"
"--prefix" (getcwd) "-i" "en_US" "--prefix" (getcwd) "-i" "en_US"

11
gnu/packages/guile.scm
View File

@ -261,16 +261,7 @@ many readers as needed).")
(("\"libguile-ncurses\"") (("\"libguile-ncurses\"")
(format #f "\"~a/lib/libguile-ncurses\"" (format #f "\"~a/lib/libguile-ncurses\""
out))))) out)))))
(alist-cons-before %standard-phases)))
'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://www.gnu.org/software/guile-ncurses/") (home-page "http://www.gnu.org/software/guile-ncurses/")
(synopsis "Guile bindings to ncurses") (synopsis "Guile bindings to ncurses")
(description (description

12
gnu/packages/python.scm
View File

@ -2251,12 +2251,6 @@ backend = GTK3Agg~%")))))
(info (string-append data "/info")) (info (string-append data "/info"))
(html (string-append doc "/html"))) (html (string-append doc "/html")))
(with-directory-excursion "doc" (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. ;; Produce pdf in 'A4' format.
(substitute* (find-files "." "conf\\.py") (substitute* (find-files "." "conf\\.py")
(("latex_paper_size = 'letter'") (("latex_paper_size = 'letter'")
@ -2349,12 +2343,6 @@ toolkits.")
(html (string-append doc "/html")) (html (string-append doc "/html"))
(pyver ,(string-append "PYVER="))) (pyver ,(string-append "PYVER=")))
(with-directory-excursion "doc" (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. ;; Fix generation of images for mathematical expressions.
(substitute* (find-files "source" "conf\\.py") (substitute* (find-files "source" "conf\\.py")
(("pngmath_use_preview = True") (("pngmath_use_preview = True")

14
gnu/packages/swig.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -54,18 +54,6 @@
;; The python part probably never worked and does not seem to ;; The python part probably never worked and does not seem to
;; be needed for currently dependent packages. ;; be needed for currently dependent packages.
;; ("python" ,python-wrapper))) ;; ("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/") (home-page "http://swig.org/")
(synopsis (synopsis
"Interface compiler that connects C/C++ code to higher-level languages") "Interface compiler that connects C/C++ code to higher-level languages")