guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into core-updates


From: Mark H. Weaver
Subject: 01/01: Merge branch 'master' into core-updates
Date: Sun, 6 Nov 2016 08:31:10 +0000 (UTC)

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

commit 8b6ad165d1fa479e5da2938d099dba356186e07c
Merge: 9422c98 7f46589
Author: Mark H Weaver <address@hidden>
Date:   Sun Nov 6 03:29:06 2016 -0500

    Merge branch 'master' into core-updates

 build-aux/run-system-tests.scm                     |    1 +
 gnu/local.mk                                       |    9 +-
 gnu/packages/admin.scm                             |   24 +-
 gnu/packages/audio.scm                             |   52 +-
 gnu/packages/base.scm                              |    6 +
 gnu/packages/bioinformatics.scm                    |   20 +-
 gnu/packages/cdrom.scm                             |   36 +
 gnu/packages/cross-base.scm                        |   43 +-
 gnu/packages/firmware.scm                          |    4 +-
 gnu/packages/fonts.scm                             |   46 +
 gnu/packages/freeipmi.scm                          |    4 +-
 gnu/packages/ftp.scm                               |   27 +-
 gnu/packages/games.scm                             |   19 +-
 gnu/packages/gnome.scm                             |    4 +-
 gnu/packages/gnunet.scm                            |    4 +-
 gnu/packages/gstreamer.scm                         |   38 +-
 gnu/packages/ibus.scm                              |    8 +-
 gnu/packages/image.scm                             |   63 +-
 gnu/packages/libidn.scm                            |   25 +-
 gnu/packages/make-bootstrap.scm                    |    5 +-
 gnu/packages/maths.scm                             |    7 +-
 gnu/packages/networking.scm                        |    7 +-
 .../patches/libjxr-fix-function-signature.patch    |   16 +
 gnu/packages/patches/libjxr-fix-typos.patch        |   29 +
 .../patches/python-ipython-inputhook-ctype.patch   |   41 -
 .../patches/w3m-disable-sslv2-and-sslv3.patch      |   24 -
 .../patches/w3m-disable-weak-ciphers.patch         |   24 -
 .../patches/w3m-force-ssl_verify_server-on.patch   |   24 -
 gnu/packages/patches/w3m-libgc.patch               |   28 -
 gnu/packages/patches/weex-vacopy.patch             |   13 -
 gnu/packages/pdf.scm                               |   26 +
 gnu/packages/python.scm                            |  577 +++-
 gnu/packages/statistics.scm                        |  127 +-
 gnu/packages/video.scm                             |   29 +
 gnu/packages/w3m.scm                               |   33 +-
 gnu/packages/web.scm                               |   29 +
 gnu/packages/webkit.scm                            |    4 +-
 gnu/packages/xiph.scm                              |    8 +-
 guix/import/cran.scm                               |    2 +-
 po/guix/pt_BR.po                                   | 3022 ++++++++++++++++----
 40 files changed, 3608 insertions(+), 900 deletions(-)

diff --cc gnu/local.mk
index 49f53e6,1ac3361..4bdace4
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -5,8 -5,8 +5,9 @@@
  # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <address@hidden>
  # Copyright © 2016 Chris Marusich <address@hidden>
  # Copyright © 2016 Kei Kebreau <address@hidden>
 +# Copyright © 2016 Rene Saavedra <address@hidden>
  # Copyright © 2016 Adonay "adfeno" Felipe Nogueira 
<https://libreplanet.org/wiki/User:Adfeno> <address@hidden>
+ # Copyright © 2016 Ricardo Wurmus <address@hidden>
  #
  # This file is part of GNU Guix.
  #
@@@ -791,13 -805,9 +794,12 @@@ dist_patch_DATA =                                
                
    %D%/packages/patches/python-2.7-source-date-epoch.patch     \
    %D%/packages/patches/python-3-deterministic-build-info.patch        \
    %D%/packages/patches/python-3-search-paths.patch            \
 +  %D%/packages/patches/python-3.4-fix-tests.patch             \
 +  %D%/packages/patches/python-3.5-fix-tests.patch             \
    %D%/packages/patches/python-dendropy-exclude-failing-tests.patch \
 -  %D%/packages/patches/python-disable-ssl-test.patch          \
 +  %D%/packages/patches/python-file-double-encoding-bug.patch  \
    %D%/packages/patches/python-fix-tests.patch                 \
-   %D%/packages/patches/python-ipython-inputhook-ctype.patch   \
 +  %D%/packages/patches/python-parse-too-many-fields.patch     \
    %D%/packages/patches/python-rarfile-fix-tests.patch         \
    %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch        \
    %D%/packages/patches/python-statsmodels-fix-tests.patch     \
diff --cc gnu/packages/cross-base.scm
index c73222a,4b720ba..e6553dc
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@@ -24,9 -23,7 +24,8 @@@
    #:use-module (gnu packages)
    #:use-module (gnu packages gcc)
    #:use-module (gnu packages base)
-   #:use-module (gnu packages commencement)
    #:use-module (gnu packages linux)
 +  #:use-module (gnu packages hurd)
    #:use-module (guix packages)
    #:use-module (guix download)
    #:use-module (guix utils)
@@@ -323,235 -319,59 +322,209 @@@ GCC that does not target a libc; otherw
                         ("cross-binutils" ,xbinutils)
                         ,@(package-native-inputs linux-libre-headers)))))
  
 -  (package (inherit glibc)
 -    (name (string-append "glibc-cross-" target))
 -    (arguments
 -     (substitute-keyword-arguments
 -         `(;; Disable stripping (see above.)
 -           #:strip-binaries? #f
 +  (define xgnumach-headers
 +    (package (inherit gnumach-headers)
 +      (name (string-append (package-name gnumach-headers)
 +                           "-cross-" target))
 +
 +      (native-inputs `(("cross-gcc" ,xgcc)
 +                       ("cross-binutils" ,xbinutils)
 +                       ,@(package-native-inputs gnumach-headers)))))
 +
 +  (define xmig
 +    (package (inherit mig)
 +      (name (string-append "mig-cross"))
 +      (arguments
 +       `(#:modules ((guix build gnu-build-system)
 +                    (guix build utils)
 +                    (srfi srfi-26))
 +         #:phases (alist-cons-before
 +                   'configure 'set-cross-headers-path
 +                   (lambda* (#:key inputs #:allow-other-keys)
 +                     (let* ((mach (assoc-ref inputs "cross-gnumach-headers"))
 +                            (cpath (string-append mach "/include")))
 +                       (for-each (cut setenv <> cpath)
 +                                 '("CROSS_C_INCLUDE_PATH"
 +                                   "CROSS_CPLUS_INCLUDE_PATH"
 +                                   "CROSS_OBJC_INCLUDE_PATH"
 +                                   "CROSS_OBJCPLUS_INCLUDE_PATH"))))
 +                   %standard-phases)
 +         #:configure-flags (list ,(string-append "--target=" target))
 +         ,@(package-arguments mig)))
 +
 +      (propagated-inputs `(("cross-gnumach-headers" ,xgnumach-headers)))
 +      (native-inputs `(("cross-gcc" ,xgcc)
 +                       ("cross-binutils" ,xbinutils)
 +                       ,@(package-native-inputs mig)))))
 +
 +  (define xhurd-headers
 +    (package (inherit hurd-headers)
 +      (name (string-append (package-name hurd-headers)
 +                           "-cross-" target))
  
 -           ;; This package is used as a target input, but it should not have
 -           ;; the usual cross-compilation inputs since that would include
 -           ;; itself.
 -           #:implicit-cross-inputs? #f
 +      (propagated-inputs `(("cross-mig" ,xmig)))
 +      (native-inputs `(("cross-gcc" ,xgcc)
 +                       ("cross-binutils" ,xbinutils)
 +                       ("cross-mig" ,xmig)
 +                       ,@(alist-delete "mig"(package-native-inputs 
hurd-headers))))))
 +
 +   (define xglibc/hurd-headers
 +    (package (inherit glibc/hurd-headers)
 +      (name (string-append (package-name glibc/hurd-headers)
 +                           "-cross-" target))
  
 -           ;; We need SRFI 26.
 -           #:modules ((guix build gnu-build-system)
 +      (arguments
 +       (substitute-keyword-arguments
 +           `(#:modules ((guix build gnu-build-system)
 +                        (guix build utils)
 +                        (srfi srfi-26))
 +             ,@(package-arguments glibc/hurd-headers))
 +         ((#:phases phases)
 +          `(alist-cons-before
 +            'pre-configure 'set-cross-headers-path
 +            (lambda* (#:key inputs #:allow-other-keys)
 +              (let* ((mach (assoc-ref inputs "gnumach-headers"))
 +                     (hurd (assoc-ref inputs "hurd-headers"))
 +                     (cpath (string-append mach "/include:"
 +                                           hurd "/include")))
 +                (for-each (cut setenv <> cpath)
 +                          '("CROSS_C_INCLUDE_PATH"
 +                            "CROSS_CPLUS_INCLUDE_PATH"
 +                            "CROSS_OBJC_INCLUDE_PATH"
 +                            "CROSS_OBJCPLUS_INCLUDE_PATH"))))
 +            ,phases))))
 +
 +      (propagated-inputs `(("gnumach-headers" ,xgnumach-headers)
 +                           ("hurd-headers" ,xhurd-headers)))
 +
 +      (native-inputs `(("cross-gcc" ,xgcc)
 +                       ("cross-binutils" ,xbinutils)
 +                       ("cross-mig" ,xmig)
 +                       ,@(alist-delete "mig"(package-native-inputs 
glibc/hurd-headers))))))
 +
 +  (define xhurd-minimal
 +    (package (inherit hurd-minimal)
 +      (name (string-append (package-name hurd-minimal)
 +                           "-cross-" target))
 +      (arguments
 +       (substitute-keyword-arguments
 +         `(#:modules ((guix build gnu-build-system)
                        (guix build utils)
                        (srfi srfi-26))
 +           ,@(package-arguments hurd-minimal))
 +         ((#:phases phases)
 +          `(alist-cons-before
 +            'configure 'set-cross-headers-path
 +            (lambda* (#:key inputs #:allow-other-keys)
 +              (let* ((glibc-headers (assoc-ref inputs 
"cross-glibc-hurd-headers"))
 +                    (cpath (string-append glibc-headers "/include")))
 +                (for-each (cut setenv <> cpath)
 +                          '("CROSS_C_INCLUDE_PATH"
 +                            "CROSS_CPLUS_INCLUDE_PATH"
 +                            "CROSS_OBJC_INCLUDE_PATH"
 +                            "CROSS_OBJCPLUS_INCLUDE_PATH"))))
 +            ,phases))))
  
 -           ,@(package-arguments glibc))
 -       ((#:configure-flags flags)
 -        `(cons ,(string-append "--host=" target)
 +      (inputs `(("cross-glibc-hurd-headers" ,xglibc/hurd-headers)))
 +
 +      (native-inputs `(("cross-gcc" ,xgcc)
 +                       ("cross-binutils" ,xbinutils)
 +                       ("cross-mig" ,xmig)
 +                       ,@(alist-delete "mig"(package-native-inputs 
hurd-minimal))))))
 +
 +  (define xhurd-core-headers
 +    (package (inherit hurd-core-headers)
 +      (name (string-append (package-name hurd-core-headers)
 +                           "-cross-" target))
 +
 +      (inputs `(("gnumach-headers" ,xgnumach-headers)
 +                ("hurd-headers" ,xhurd-headers)
 +                ("hurd-minimal" ,xhurd-minimal)))
 +
 +      (native-inputs `(("cross-gcc" ,xgcc)
 +                       ("cross-binutils" ,xbinutils)
 +                       ("cross-mig" ,xmig)
 +                       ,@(package-native-inputs hurd-core-headers)))))
 +
 +  (match target
 +    ((or "i586-pc-gnu" "i586-gnu") xhurd-core-headers)
 +    (_ xlinux-headers)))
 +
 +(define* (cross-libc target
 +                     #:optional
 +                     (xgcc (cross-gcc target))
 +                     (xbinutils (cross-binutils target))
 +                     (xheaders (cross-kernel-headers target)))
 +  "Return a libc cross-built for TARGET, a GNU triplet.  Use XGCC and
 +XBINUTILS and the cross tool chain."
 +  (define (cross-libc-for-target target)
 +    "Return libc depending on TARGET."
 +    (match target
 +      ((or "i586-pc-gnu" "i586-gnu") glibc/hurd)
 +      (_ glibc/linux)))
 +
 +  ;; Use (cross-libc-for-target ...) to determine the correct libc to use.
 +  (let ((libc (cross-libc-for-target target)))
 +    (package (inherit libc)
 +      (name (string-append "glibc-cross-" target))
 +      (arguments
 +       (substitute-keyword-arguments
 +           `(;; Disable stripping (see above.)
 +             #:strip-binaries? #f
 +
 +             ;; This package is used as a target input, but it should not have
 +             ;; the usual cross-compilation inputs since that would include
 +             ;; itself.
 +             #:implicit-cross-inputs? #f
 +
 +             ;; We need SRFI 26.
 +             #:modules ((guix build gnu-build-system)
 +                        (guix build utils)
 +                        (srfi srfi-26))
 +
 +             ,@(package-arguments libc))
 +         ((#:configure-flags flags)
 +          `(cons ,(string-append "--host=" target)
                 ,flags))
 -       ((#:phases phases)
 -        `(alist-cons-before
 -          'configure 'set-cross-kernel-headers-path
 -          (lambda* (#:key inputs #:allow-other-keys)
 -            (let* ((kernel (assoc-ref inputs "kernel-headers"))
 -                   (cpath (string-append kernel "/include")))
 -              (for-each (cut setenv <> cpath)
 -                        '("CROSS_C_INCLUDE_PATH"
 -                          "CROSS_CPLUS_INCLUDE_PATH"
 -                          "CROSS_OBJC_INCLUDE_PATH"
 -                          "CROSS_OBJCPLUS_INCLUDE_PATH"))
 -              #t))
 -          ,phases))))
 -
 -    ;; Shadow the native "kernel-headers" because glibc's recipe expects the
 -    ;; "kernel-headers" input to point to the right thing.
 -    (propagated-inputs `(("kernel-headers" ,xlinux-headers)))
 -
 -    ;; FIXME: 'static-bash' should really be an input, not a native input, but
 -    ;; to do that will require building an intermediate cross libc.
 -    (inputs '())
 +         ((#:phases phases)
 +          `(alist-cons-before
 +            'configure 'set-cross-kernel-headers-path
 +            (lambda* (#:key inputs #:allow-other-keys)
 +              (let* ((kernel (assoc-ref inputs "kernel-headers"))
 +                     (cpath (string-append kernel "/include")))
 +                (for-each (cut setenv <> cpath)
 +                          '("CROSS_C_INCLUDE_PATH"
 +                            "CROSS_CPLUS_INCLUDE_PATH"
 +                            "CROSS_OBJC_INCLUDE_PATH"
 +                            "CROSS_OBJCPLUS_INCLUDE_PATH"))
 +                (setenv "CROSS_LIBRARY_PATH"
 +                        (string-append kernel "/lib")) ;for Hurd's libihash
 +                #t))
 +            ,phases))))
  
 -    (native-inputs `(("cross-gcc" ,xgcc)
 -                     ("cross-binutils" ,xbinutils)
 -                     ,@(package-inputs glibc)     ;FIXME: static-bash
 -                     ,@(package-native-inputs glibc)))))
 +      ;; Shadow the native "kernel-headers" because glibc's recipe expects the
 +      ;; "kernel-headers" input to point to the right thing.
 +      (propagated-inputs `(("kernel-headers" ,xheaders)))
 +
 +      ;; FIXME: 'static-bash' should really be an input, not a native input, 
but
 +      ;; to do that will require building an intermediate cross libc.
 +      (inputs '())
 +
 +      (native-inputs `(("cross-gcc" ,xgcc)
 +                       ("cross-binutils" ,xbinutils)
 +                       ,@(if (string-match (or "i586-pc-gnu" "i586-gnu") 
target)
 +                             `(("cross-mig"
 +                                ,@(assoc-ref (package-native-inputs xheaders)
 +                                             "cross-mig")))
 +                             '())
 +                       ,@(package-inputs libc)     ;FIXME: static-bash
 +                       ,@(package-native-inputs libc))))))
  
  
- ;;;
- ;;; Concrete cross toolchains.
- ;;;
- 
- (define-public xgcc-mips64el
-   (let* ((triplet "mips64el-linux-gnuabi64")      ;N64 ABI
-          (xgcc    (cross-gcc triplet
-                              (cross-binutils triplet)
-                              (cross-libc triplet))))
-     ;; Don't attempt to build this cross-compiler on i686;
-     ;; see <http://bugs.gnu.org/19598>.
-     (package (inherit xgcc)
-       (supported-systems (fold delete
-                                (package-supported-systems xgcc)
-                                '("mips64el-linux" "i686-linux"))))))
- 
- (define-public xgcc-xtensa
-   ;; Bare-bones Xtensa cross-compiler, used to build the Atheros firmware.
-   (cross-gcc "xtensa-elf"))
- 
- (define-public xgcc-armhf
-   (let* ((triplet "arm-linux-gnueabihf")
-          (xgcc    (cross-gcc triplet
-                              (cross-binutils triplet)
-                              (cross-libc triplet))))
-     (package (inherit xgcc)
-       (supported-systems (delete "armhf-linux" %supported-systems)))))
- 
- ;; (define-public xgcc-armel
- ;;   (let ((triplet "armel-linux-gnueabi"))
+ ;;; Concrete cross tool chains are instantiated like this:
+ ;;
+ ;; (define-public xgcc-armhf
+ ;;   (let ((triplet "arm-linux-gnueabihf"))
  ;;     (cross-gcc triplet
  ;;                (cross-binutils triplet)
  ;;                (cross-libc triplet))))
diff --cc gnu/packages/fonts.scm
index 22857e8,3022d9a..009efd2
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@@ -11,7 -11,7 +11,8 @@@
  ;;; Copyright © 2016 Jookia <address@hidden>
  ;;; Copyright © 2016 Eric Bavier <address@hidden>
  ;;; Copyright © 2016 Dmitry Nikolaev <address@hidden>
 +;;; Copyright © 2016 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2016 Marius Bakke <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/libidn.scm
index 0c9d0af,79baa39..bc67387
--- a/gnu/packages/libidn.scm
+++ b/gnu/packages/libidn.scm
@@@ -46,3 -47,38 +47,25 @@@ Java libraries."
     ;; the command line tool is gpl3+.
     (license (list gpl2+ gpl3+ lgpl3+ fdl1.3+))
     (home-page "http://www.gnu.org/software/libidn/";)))
+ 
 -(define libidn-1.33
 -  (package
 -    (inherit libidn)
 -    (source
 -      (let ((version "1.33"))
 -        (origin
 -          (method url-fetch)
 -          (uri (string-append "mirror://gnu/libidn/libidn-" version
 -                              ".tar.gz"))
 -          (sha256
 -           (base32
 -            "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4")))))))
 -
+ (define-public libidn2
+   (package
+     (name "libidn2")
+     (version "0.11")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "ftp://alpha.gnu.org/gnu/libidn/libidn2-";
+                                   version ".tar.gz"))
+               (sha256
+                (base32
+                 "1zxzhzx14q2b1xkx746pz4lawvqd8d055yy84n52ndwb4pf7nfax"))))
+     (build-system gnu-build-system)
+     (synopsis "Internationalized domain name library for IDNA2008")
+     (description "Libidn2 is an internationalized domain library implementing
+ the IDNA2008 specifications.   Libidn2 is believed to be a complete IDNA2008
+ implementation, but has yet to be as extensively used as the original Libidn
+ library.")
+     (home-page "https://www.gnu.org/software/libidn/#libidn2";)
+     ;; The command-line tool 'idn2' is GPL3+, while the library is 
dual-licensed
+     ;; GPL2+ or LGPL3+.
+     (license (list gpl2+ gpl3+ lgpl3+))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]