[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'core-updates'
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: Merge branch 'core-updates' |
|
Date: |
Fri, 16 Jan 2015 12:30:15 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 57b7e1a62d2269bfd9d37f88bae92c829222f8fc
Merge: 72b703c b01a0ba
Author: Ludovic Courtès <address@hidden>
Date: Fri Jan 16 13:27:03 2015 +0100
Merge branch 'core-updates'
Conflicts:
gnu/packages/bootstrap.scm
.gitignore | 1 +
build-aux/check-available-binaries.scm | 53 +--
build-aux/check-final-inputs-self-contained.scm | 5 +-
build-aux/download.scm | 8 +-
doc/guix.texi | 4 +
gnu-system.am | 29 +-
gnu/packages/apr.scm | 2 +-
gnu/packages/autotools.scm | 123 +++---
gnu/packages/base.scm | 41 +-
gnu/packages/bash.scm | 8 +-
gnu/packages/boost.scm | 4 +-
gnu/packages/bootstrap.scm | 67 +++-
gnu/packages/bootstrap/armhf-linux/bash | Bin 0 -> 802224 bytes
gnu/packages/bootstrap/armhf-linux/mkdir | Bin 0 -> 401544 bytes
gnu/packages/bootstrap/armhf-linux/tar | Bin 0 -> 755356 bytes
gnu/packages/bootstrap/armhf-linux/xz | Bin 0 -> 502884 bytes
gnu/packages/commencement.scm | 15 +-
gnu/packages/compression.scm | 24 +-
gnu/packages/cross-base.scm | 30 +-
gnu/packages/curl.scm | 6 +-
gnu/packages/databases.scm | 8 +-
gnu/packages/elf.scm | 26 +-
gnu/packages/file.scm | 28 +-
gnu/packages/fontutils.scm | 3 +-
gnu/packages/games.scm | 2 +-
gnu/packages/gawk.scm | 24 +-
gnu/packages/gcc.scm | 74 ++--
gnu/packages/gd.scm | 22 +-
gnu/packages/gettext.scm | 4 +-
gnu/packages/glib.scm | 4 +-
gnu/packages/global.scm | 4 +-
gnu/packages/gnome.scm | 11 -
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnutls.scm | 6 +-
gnu/packages/gps.scm | 12 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/gtk.scm | 15 +-
gnu/packages/guile.scm | 29 +-
gnu/packages/icu4c.scm | 31 +-
gnu/packages/image.scm | 6 +-
gnu/packages/ld-wrapper.scm | 95 ++--
gnu/packages/libcanberra.scm | 4 +-
gnu/packages/libevent.scm | 4 +-
gnu/packages/linux.scm | 90 ++---
gnu/packages/m4.scm | 3 +-
gnu/packages/mail.scm | 6 +-
gnu/packages/make-bootstrap.scm | 14 +-
gnu/packages/man.scm | 2 +-
gnu/packages/mit-krb5.scm | 8 +-
gnu/packages/mp3.scm | 4 +-
gnu/packages/multiprecision.scm | 15 +-
gnu/packages/ncurses.scm | 7 +-
gnu/packages/openldap.scm | 4 +-
gnu/packages/openssl.scm | 6 +-
gnu/packages/patches/curl-gss-api-fix.patch | 38 ++
gnu/packages/patches/file-CVE-2014-3587.patch | 16 -
gnu/packages/patches/gcc-fix-pr61801.patch | 25 -
gnu/packages/patches/gd-mips64-deplibs-fix.patch | 17 -
gnu/packages/patches/glibc-CVE-2012-3406.patch | 282 ++++++++++++
gnu/packages/patches/glibc-CVE-2014-7817.patch | 171 +++++++
.../patches/glibc-mips-dangling-vfork-ref.patch | 45 ++
gnu/packages/patches/gmp-arm-asm-nothumb.patch | 21 +
gnu/packages/patches/guile-arm-fixes.patch | 203 +++++++++
gnu/packages/patches/libtool-2.4-skip-tests.patch | 24 -
.../patches/libtool-skip-tests-for-mips.patch | 12 -
gnu/packages/patches/libtool-skip-tests.patch | 82 ++--
gnu/packages/patches/m4-readlink-EINVAL.patch | 18 -
gnu/packages/patches/patchelf-page-size.patch | 33 +-
gnu/packages/patches/patchelf-rework-for-arm.patch | 473 ++++++++++++++++++++
.../patches/sqlite-large-page-size-fix.patch | 180 --------
gnu/packages/patchutils.scm | 2 +-
gnu/packages/perl.scm | 2 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/pkg-config.scm | 7 +-
gnu/packages/pth.scm | 9 +-
gnu/packages/pulseaudio.scm | 6 +-
gnu/packages/python.scm | 4 +-
gnu/packages/ruby.scm | 7 +-
gnu/packages/ssh.scm | 2 +-
gnu/packages/swig.scm | 13 +
gnu/packages/tcl.scm | 10 +-
gnu/packages/texlive.scm | 3 +-
gnu/packages/tre.scm | 14 +-
gnu/packages/version-control.scm | 2 +-
gnu/packages/web.scm | 16 +-
gnu/packages/weechat.scm | 6 +-
gnu/packages/xfce.scm | 2 +-
gnu/packages/xiph.scm | 7 +-
gnu/packages/xml.scm | 14 +-
gnu/packages/xorg.scm | 4 +-
guix/build/gnu-build-system.scm | 173 +++++--
guix/build/utils.scm | 164 ++++++--
guix/packages.scm | 20 +-
guix/scripts/environment.scm | 8 +-
guix/scripts/package.scm | 28 +-
guix/utils.scm | 24 +-
m4/guix.m4 | 13 +-
tests/packages.scm | 55 +++-
98 files changed, 2274 insertions(+), 984 deletions(-)
diff --cc gnu/packages/bootstrap.scm
index 56c26ee,8373c4b..1f0fe16
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@@ -1,5 -1,6 +1,6 @@@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+ ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;