[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Mon, 23 May 2016 13:04:39 +0000 (UTC) |
civodul pushed a commit to branch core-updates
in repository guix.
commit bc73a84398fa54b0a11a80c749bf78eb0a58dbe6
Merge: 12b6f65 624d4e2
Author: Ludovic Courtès <address@hidden>
Date: Mon May 23 14:55:44 2016 +0200
Merge branch 'master' into core-updates
.mailmap | 1 +
Makefile.am | 2 +-
doc/guix.texi | 27 +
gnu/local.mk | 9 +-
gnu/packages/bioinformatics.scm | 220 +++---
gnu/packages/calendar.scm | 11 +-
gnu/packages/code.scm | 4 +-
gnu/packages/crypto.scm | 42 ++
gnu/packages/databases.scm | 15 +-
gnu/packages/dillo.scm | 2 +-
gnu/packages/emacs.scm | 96 ++-
gnu/packages/finance.scm | 106 +++
gnu/packages/fltk.scm | 2 +-
gnu/packages/freedesktop.scm | 18 +-
gnu/packages/fvwm.scm | 10 +-
gnu/packages/game-development.scm | 6 +-
gnu/packages/games.scm | 12 +-
gnu/packages/gcc.scm | 22 +
gnu/packages/gd.scm | 9 +-
gnu/packages/geeqie.scm | 8 +-
gnu/packages/gkrellm.scm | 5 +-
gnu/packages/gnome.scm | 128 +++-
gnu/packages/gnu-pw-mgr.scm | 5 +-
gnu/packages/gnustep.scm | 12 +-
gnu/packages/gnuzilla.scm | 6 +-
gnu/packages/graphics.scm | 31 +-
gnu/packages/grub.scm | 5 +-
gnu/packages/gtk.scm | 29 +
gnu/packages/guile.scm | 7 +-
gnu/packages/hugs.scm | 5 +-
gnu/packages/hurd.scm | 12 +-
gnu/packages/image.scm | 54 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/java.scm | 74 +-
gnu/packages/jemalloc.scm | 4 +-
gnu/packages/libbsd.scm | 47 ++
gnu/packages/libidn.scm | 5 +-
gnu/packages/linux.scm | 96 ++-
gnu/packages/mail.scm | 60 +-
gnu/packages/maths.scm | 50 +-
gnu/packages/music.scm | 2 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/owncloud.scm | 4 +-
gnu/packages/package-management.scm | 8 +-
.../patches/emacs-constants-lisp-like.patch | 81 ---
.../patches/expat-CVE-2015-1283-refix.patch | 42 ++
gnu/packages/patches/expat-CVE-2016-0718.patch | 761 ++++++++++++++++++++
gnu/packages/patches/gd-CVE-2016-3074.patch | 36 +
.../patches/gnome-tweak-tool-search-paths.patch | 52 ++
gnu/packages/patches/mdadm-gcc-4.9-fix.patch | 38 -
.../python-pandas-fix-tslib-test-failure.patch | 141 ----
gnu/packages/plotutils.scm | 27 +-
gnu/packages/python.scm | 91 ++-
gnu/packages/qemu.scm | 9 +-
gnu/packages/qt.scm | 6 +-
gnu/packages/scheme.scm | 59 +-
gnu/packages/shellutils.scm | 50 ++
gnu/packages/statistics.scm | 91 ++-
gnu/packages/textutils.scm | 44 +-
gnu/packages/tls.scm | 42 +-
gnu/packages/tmux.scm | 5 +-
gnu/packages/version-control.scm | 5 +-
gnu/packages/web.scm | 100 ++-
gnu/packages/xfce.scm | 2 +-
gnu/packages/xml.scm | 1 +
guix/build/ant-build-system.scm | 12 +
guix/build/download.scm | 105 ++-
guix/build/graft.scm | 28 +-
guix/derivations.scm | 133 ++--
guix/download.scm | 45 +-
guix/graph.scm | 2 +-
guix/import/cran.scm | 8 +-
guix/import/gnu.scm | 48 +-
guix/scripts/build.scm | 13 +-
guix/scripts/graph.scm | 82 ++-
guix/scripts/import.scm | 11 +-
guix/scripts/lint.scm | 21 +-
guix/scripts/substitute.scm | 12 +-
guix/store.scm | 2 +-
guix/upstream.scm | 5 +-
tests/derivations.scm | 27 +
tests/grafts.scm | 41 ++
tests/guix-graph.sh | 18 +-
83 files changed, 2764 insertions(+), 811 deletions(-)
diff --cc gnu/local.mk
index a1700a5,c130901..0287bef
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -491,9 -495,9 +492,10 @@@ dist_patch_DATA =
gnu/packages/patches/gawk-shell.patch \
gnu/packages/patches/gcc-arm-link-spec-fix.patch \
gnu/packages/patches/gcc-cross-environment-variables.patch \
+ gnu/packages/patches/gcc-libiberty-printf-decl.patch \
gnu/packages/patches/gcc-libvtv-runpath.patch \
gnu/packages/patches/gcc-5.0-libvtv-runpath.patch \
+ gnu/packages/patches/gd-CVE-2016-3074.patch \
gnu/packages/patches/geoclue-config.patch \
gnu/packages/patches/ghostscript-CVE-2015-3228.patch \
gnu/packages/patches/ghostscript-runpath.patch \
diff --cc gnu/packages/linux.scm
index 6e3228f,5b1d2a9..90f5602
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -2550,22 -2559,10 +2573,22 @@@ and copy/paste text in the console and
"btrfs-progs-v" version ".tar.xz"))
(sha256
(base32
- "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
+ "1lzbw275xgv69v4z8hmsf3jnip38116hxhkpv0madk8wv049drz6"))))
(build-system gnu-build-system)
+ (outputs '("out"
+ "static")) ; static versions of binaries in "out"
(~16MiB!)
(arguments
- '(#:test-target "test"
+ '(#:phases (modify-phases %standard-phases
+ (add-after 'build 'build-static
+ (lambda _ (zero? (system* "make" "static"))))
+ (add-after 'install 'install-static
+ (let ((staticbin (string-append (assoc-ref %outputs
"static")
+ "/bin")))
+ (lambda _
+ (zero? (system* "make"
+ (string-append "bindir=" staticbin)
+ "install-static"))))))
+ #:test-target "test"
#:parallel-tests? #f)) ; tests fail when run in parallel
(inputs `(("e2fsprogs" ,e2fsprogs)
("libblkid" ,util-linux)
diff --cc gnu/packages/python.scm
index adef5e6,602da2d..d2698d4
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -90,10 -91,10 +91,10 @@@
#:use-module (guix build-system trivial)
#:use-module (srfi srfi-1))
- (define-public python-2
+ (define-public python-2.7
(package
(name "python")
- (version "2.7.10")
+ (version "2.7.11")
(source
(origin
(method url-fetch)
diff --cc gnu/packages/scheme.scm
index 5601d6c,6f2ce9f..c345d59
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@@ -1,9 -1,10 +1,10 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
-;;; Copyright © 2015 Federico Beffa <address@hidden>
+;;; Copyright © 2015, 2016 Federico Beffa <address@hidden>
;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -22,19 -23,17 +23,23 @@@
(define-module (gnu packages scheme)
#:use-module (gnu packages)
- #:use-module ((guix licenses) #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0
bsd-3))
- #:use-module (guix licenses)
++ #:use-module ((guix licenses)
++ #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3
++ cc-by-sa4.0))
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system trivial)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages m4)
#:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages databases)
#:use-module (gnu packages emacs)
+ #:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages netpbm)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages texlive)
#:use-module (gnu packages base)
diff --cc gnu/packages/xml.scm
index 538996f,9eaf71a..a5ea3d0
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -4,10 -4,10 +4,11 @@@
;;; Copyright © 2015 Eric Bavier <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Efraim Flashner <address@hidden>
;;; Copyright © 2015 Raimon Grau <address@hidden>
+;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
+ ;;; Copyright © 2016 Leo Famulari <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;