[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Mathieu Lirzin |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Mon, 02 May 2016 15:55:35 +0000 |
mthl pushed a commit to branch core-updates
in repository guix.
commit c3052d6bcd2193b258fb92b99291a4918931fe36
Merge: 0bfb9b4 b74f64a
Author: Mathieu Lirzin <address@hidden>
Date: Mon May 2 17:53:40 2016 +0200
Merge branch 'master' into core-updates
Makefile.am | 21 +-
NEWS | 6 +
build-aux/check-available-binaries.scm | 5 +-
build-aux/hydra/evaluate.scm | 98 +
build-aux/hydra/gnu-system.scm | 35 +-
pre-inst-env.in => build-aux/pre-inst-env.in | 0
test-env.in => build-aux/test-env.in | 0
configure.ac | 5 +-
doc/contributing.texi | 8 +-
doc/emacs.texi | 78 +-
doc/guix.texi | 174 +-
doc.am => doc/local.mk | 0
emacs/guix-backend.el | 24 +-
emacs/guix-base.el | 62 +-
emacs/guix-config.el.in | 2 +-
emacs/guix-license.el | 103 +-
emacs/guix-location.el | 79 +
emacs/guix-main.scm | 42 +
emacs/guix-messages.el | 15 +
emacs/guix-read.el | 11 +
emacs/{guix-license.el => guix-ui-license.el} | 68 +-
emacs/guix-ui-location.el | 83 +
emacs/guix-ui-package.el | 41 +-
emacs/guix-ui.el | 33 +-
emacs/guix-utils.el | 28 +-
emacs.am => emacs/local.mk | 3 +
etc/guix-daemon.service.in | 3 +
gnu.scm | 3 +-
gnu/build/file-systems.scm | 144 +-
gnu-system.am => gnu/local.mk | 51 +-
gnu/packages.scm | 6 +
gnu/packages/abduco.scm | 4 +-
gnu/packages/abiword.scm | 39 +-
gnu/packages/acl.scm | 2 +-
gnu/packages/admin.scm | 39 +-
gnu/packages/algebra.scm | 151 +-
gnu/packages/animation.scm | 2 +-
gnu/packages/anthy.scm | 64 +
gnu/packages/apr.scm | 2 +-
gnu/packages/audacity.scm | 2 +-
gnu/packages/audio.scm | 14 +-
gnu/packages/autotools.scm | 8 +-
gnu/packages/avahi.scm | 2 +-
gnu/packages/backup.scm | 19 +-
gnu/packages/base.scm | 35 +-
gnu/packages/bash.scm | 2 +-
gnu/packages/bioinformatics.scm | 390 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/bootstrap.scm | 8 +-
gnu/packages/c.scm | 127 +
gnu/packages/cdrom.scm | 2 +-
gnu/packages/ci.scm | 8 +-
gnu/packages/cmake.scm | 2 +-
gnu/packages/compression.scm | 69 +-
gnu/packages/cpio.scm | 2 +-
gnu/packages/cross-base.scm | 2 +-
gnu/packages/cups.scm | 117 +-
gnu/packages/databases.scm | 8 +-
gnu/packages/dav.scm | 10 +-
gnu/packages/dico.scm | 5 +-
gnu/packages/dillo.scm | 63 +
gnu/packages/docbook.scm | 30 +-
gnu/packages/doxygen.scm | 2 +-
gnu/packages/ebook.scm | 6 +-
gnu/packages/elf.scm | 5 +-
gnu/packages/emacs.scm | 74 +-
gnu/packages/engineering.scm | 29 +-
gnu/packages/firmware.scm | 2 +-
gnu/packages/flashing-tools.scm | 6 +-
gnu/packages/fltk.scm | 5 +-
gnu/packages/fonts.scm | 51 +-
gnu/packages/fontutils.scm | 231 +-
gnu/packages/ftp.scm | 7 +-
gnu/packages/game-development.scm | 33 +
gnu/packages/games.scm | 243 +-
gnu/packages/gawk.scm | 2 +-
gnu/packages/gcc.scm | 10 +-
gnu/packages/gd.scm | 5 +-
gnu/packages/ghostscript.scm | 4 +-
gnu/packages/gimp.scm | 53 +
gnu/packages/glib.scm | 28 +-
gnu/packages/gnome.scm | 50 +-
gnu/packages/gnucash.scm | 2 +-
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnupg.scm | 35 +-
gnu/packages/gnustep.scm | 89 +
gnu/packages/gnuzilla.scm | 65 +-
gnu/packages/graphics.scm | 75 +-
gnu/packages/grub.scm | 6 +-
gnu/packages/gtk.scm | 10 +-
gnu/packages/guile.scm | 20 +-
gnu/packages/ibus.scm | 54 +
gnu/packages/icu4c.scm | 6 +-
gnu/packages/idutils.scm | 3 +-
gnu/packages/image.scm | 98 +-
gnu/packages/imagemagick.scm | 2 +-
gnu/packages/irc.scm | 6 +-
gnu/packages/java.scm | 149 +-
gnu/packages/kde-frameworks.scm | 8 +-
gnu/packages/ldc.scm | 2 +-
gnu/packages/libcanberra.scm | 2 +-
gnu/packages/libevent.scm | 7 +-
gnu/packages/libreoffice.scm | 2 +-
gnu/packages/libunwind.scm | 2 +-
gnu/packages/libusb.scm | 49 +-
gnu/packages/linux.scm | 107 +-
gnu/packages/lirc.scm | 2 +-
gnu/packages/llvm.scm | 2 +-
gnu/packages/lsh.scm | 2 +-
gnu/packages/lua.scm | 10 +-
gnu/packages/lxde.scm | 8 +-
gnu/packages/lxqt.scm | 2 +-
gnu/packages/machine-learning.scm | 19 +
gnu/packages/mail.scm | 24 +-
gnu/packages/make-bootstrap.scm | 6 +-
gnu/packages/marst.scm | 43 +
gnu/packages/maths.scm | 64 +-
gnu/packages/mcrypt.scm | 2 +-
gnu/packages/messaging.scm | 13 +-
gnu/packages/mit-krb5.scm | 8 +-
gnu/packages/mp3.scm | 13 +-
gnu/packages/mpd.scm | 18 +-
gnu/packages/mpi.scm | 10 +-
gnu/packages/multiprecision.scm | 34 +-
gnu/packages/music.scm | 166 +-
gnu/packages/networking.scm | 21 +
gnu/packages/ninja.scm | 4 +-
gnu/packages/node.scm | 77 +-
gnu/packages/nvi.scm | 6 +-
gnu/packages/ocaml.scm | 3 +-
gnu/packages/openldap.scm | 23 +
gnu/packages/openstack.scm | 29 +-
gnu/packages/orpheus.scm | 2 +-
gnu/packages/ots.scm | 3 +-
gnu/packages/package-management.scm | 7 +-
gnu/packages/parallel.scm | 4 +-
.../abiword-link-plugins-against-backend.patch | 639 --
.../abiword-no-include-glib-internal-headers.patch | 13 -
.../abiword-pass-no-undefined-to-linker.patch | 608 --
.../patches/abiword-use-proper-png-api.patch | 175 -
gnu/packages/patches/asymptote-gsl2.patch | 33 -
gnu/packages/patches/fltk-xfont-on-demand.patch | 45 +
gnu/packages/patches/fontforge-svg-modtime.patch | 35 +
gnu/packages/patches/fossil-test-fixes.patch | 189 +
gnu/packages/patches/icecat-CVE-2015-4477.patch | 37 -
gnu/packages/patches/icecat-CVE-2015-7207.patch | 1140 ---
.../patches/icecat-CVE-2016-1952-pt01.patch | 356 -
.../patches/icecat-CVE-2016-1952-pt02.patch | 58 -
.../patches/icecat-CVE-2016-1952-pt03.patch | 60 -
.../patches/icecat-CVE-2016-1952-pt04.patch | 53 -
.../patches/icecat-CVE-2016-1952-pt05.patch | 32 -
.../patches/icecat-CVE-2016-1952-pt06.patch | 103 -
gnu/packages/patches/icecat-CVE-2016-1954.patch | 32 -
gnu/packages/patches/icecat-CVE-2016-1960.patch | 55 -
gnu/packages/patches/icecat-CVE-2016-1961.patch | 33 -
gnu/packages/patches/icecat-CVE-2016-1962.patch | 107 -
gnu/packages/patches/icecat-CVE-2016-1964.patch | 54 -
gnu/packages/patches/icecat-CVE-2016-1965.patch | 44 -
gnu/packages/patches/icecat-CVE-2016-1966.patch | 36 -
gnu/packages/patches/icecat-CVE-2016-1974.patch | 530 --
gnu/packages/patches/icecat-CVE-2016-2805.patch | 75 +
.../patches/icecat-CVE-2016-2807-pt1.patch | 35 +
.../patches/icecat-CVE-2016-2807-pt2.patch | 69 +
.../patches/icecat-CVE-2016-2807-pt3.patch | 33 +
.../patches/icecat-CVE-2016-2807-pt4.patch | 37 +
.../patches/icecat-CVE-2016-2807-pt5.patch | 35 +
gnu/packages/patches/icecat-CVE-2016-2808.patch | 389 +
gnu/packages/patches/icecat-CVE-2016-2814.patch | 35 +
gnu/packages/patches/icecat-bug-1248851.patch | 37 -
.../patches/icecat-update-bundled-graphite2.patch | 2488 +++++
.../patches/icecat-update-graphite2-pt2.patch | 861 --
gnu/packages/patches/icecat-update-graphite2.patch | 9988 --------------------
gnu/packages/patches/imlib2-CVE-2016-4024.patch | 52 +
gnu/packages/patches/openssh-CVE-2015-8325.patch | 31 +
gnu/packages/patches/poppler-CVE-2015-8868.patch | 30 +
.../python-pandas-fix-tslib-test-failure.patch | 141 +
gnu/packages/patches/ruby-symlinkfix.patch | 53 +
gnu/packages/patches/ttf2eot-cstddef.patch | 12 +
.../patches/ttfautohint-source-date-epoch.patch | 70 +
gnu/packages/patches/woff2-libbrotli.patch | 84 +
gnu/packages/patchutils.scm | 16 +-
gnu/packages/pcre.scm | 12 +-
gnu/packages/pdf.scm | 13 +-
gnu/packages/perl.scm | 18 +-
gnu/packages/plotutils.scm | 28 +-
gnu/packages/polkit.scm | 2 +-
gnu/packages/pretty-print.scm | 3 +-
gnu/packages/pulseaudio.scm | 6 +-
gnu/packages/python.scm | 594 +-
gnu/packages/qemu.scm | 27 +-
gnu/packages/qt.scm | 5 +-
gnu/packages/ratpoison.scm | 2 +-
gnu/packages/rdf.scm | 7 +-
gnu/packages/readline.scm | 2 +-
gnu/packages/ruby.scm | 23 +-
gnu/packages/rush.scm | 2 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/scheme.scm | 13 +-
gnu/packages/screen.scm | 2 +-
gnu/packages/sdl.scm | 2 +-
gnu/packages/slim.scm | 6 +-
gnu/packages/ssh.scm | 7 +-
gnu/packages/statistics.scm | 589 +-
gnu/packages/tcl.scm | 6 +-
gnu/packages/tcsh.scm | 2 +-
gnu/packages/telephony.scm | 3 +-
gnu/packages/texinfo.scm | 4 +-
gnu/packages/textutils.scm | 36 +
gnu/packages/tls.scm | 31 +-
gnu/packages/tor.scm | 2 +-
gnu/packages/tv.scm | 8 +-
gnu/packages/valgrind.scm | 2 +-
gnu/packages/version-control.scm | 106 +-
gnu/packages/video.scm | 111 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/vtk.scm | 2 +-
gnu/packages/w3m.scm | 8 +-
gnu/packages/web.scm | 86 +-
gnu/packages/webkit.scm | 8 +-
gnu/packages/wicd.scm | 10 +-
gnu/packages/wm.scm | 2 +-
gnu/packages/wxwidgets.scm | 10 +-
gnu/packages/xdisorg.scm | 153 +-
gnu/packages/xfce.scm | 66 +-
gnu/packages/xiph.scm | 41 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 25 +-
gnu/packages/zip.scm | 26 +-
gnu/services/base.scm | 32 +-
gnu/system.scm | 34 +-
gnu/system/file-systems.scm | 31 -
gnu/system/install.scm | 2 +-
gnu/system/linux-initrd.scm | 10 +-
gnu/system/mapped-devices.scm | 130 +
gnu/system/vm.scm | 4 +-
guix/build/download.scm | 56 +-
guix/build/syscalls.scm | 594 +-
guix/config.scm.in | 4 +-
guix/gnu-maintenance.scm | 170 +-
guix/import/cpan.scm | 35 +-
guix/import/cran.scm | 11 +-
guix/import/elpa.scm | 14 +-
guix/import/gem.scm | 10 +-
guix/import/github.scm | 10 +-
guix/import/hackage.scm | 10 +-
guix/import/pypi.scm | 10 +-
guix/scripts/challenge.scm | 6 +-
guix/scripts/download.scm | 10 +-
guix/scripts/environment.scm | 10 +-
guix/scripts/gc.scm | 33 +-
guix/scripts/lint.scm | 61 +-
guix/scripts/substitute.scm | 39 +-
guix/scripts/system.scm | 5 +-
guix/store.scm | 16 +-
guix/ui.scm | 13 +-
guix/upstream.scm | 74 +-
guix/utils.scm | 51 +-
daemon.am => nix/local.mk | 0
po/guix/LINGUAS | 1 +
po/guix/zh_CN.po | 2300 +++++
scripts/guix.in | 5 +
tests/lint.scm | 35 +
tests/syscalls.scm | 58 +
tests/utils.scm | 13 +
264 files changed, 12756 insertions(+), 17035 deletions(-)
diff --cc gnu/packages/base.scm
index 2b491aa,1c4ebbf..fce193c
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -81,9 -81,8 +81,8 @@@ command-line arguments, multiple langua
version ".tar.xz"))
(sha256
(base32
- "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa"))
+ "0c38b67cnwchwzv4wq2gpz6smkhdxrac2hhssv8f0l04qnx867p2"))
- (patches
- (list (search-patch "grep-timing-sensitive-test.patch")))))
+ (patches (search-patches "grep-timing-sensitive-test.patch"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl))) ;some of the tests require it
(synopsis "Print lines matching a pattern")
@@@ -475,10 -481,12 +472,9 @@@ store."
(("use_ldconfig=yes")
"use_ldconfig=no")))
(modules '((guix build utils)))
- (patches (map search-patch
- '("glibc-ldd-x86_64.patch"
- "glibc-versioned-locpath.patch"
- "glibc-o-largefile.patch")))))
- (patches
- (search-patches "glibc-ldd-x86_64.patch"
- "glibc-locale-incompatibility.patch"
- "glibc-versioned-locpath.patch"
- "glibc-o-largefile.patch"
- "glibc-CVE-2015-7547.patch"))))
++ (patches (search-patches "glibc-ldd-x86_64.patch"
++ "glibc-versioned-locpath.patch"
++ "glibc-o-largefile.patch"))))
(build-system gnu-build-system)
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
diff --cc gnu/packages/cmake.scm
index e8b292f,1cb1e06..cac059e
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@@ -45,8 -44,8 +45,8 @@@
"/cmake-" version ".tar.gz"))
(sha256
(base32
- "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7"))
+ "1yly38mpk2s08b4rglp9xcw5pxalk0whp9hrcg7j8qpxlkc3mj4j"))
- (patches (list (search-patch "cmake-fix-tests.patch")))))
+ (patches (search-patches "cmake-fix-tests.patch"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
diff --cc gnu/packages/gcc.scm
index 8b3c891,a2b8126..04d3f93
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -352,12 -352,7 +352,10 @@@ Go. It also includes runtime support l
(sha256
(base32
"1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"))
- (patches (list (search-patch "gcc-5.0-libvtv-runpath.patch")
- (search-patch
- "gcc-libiberty-printf-decl.patch")))))
-
- (patches (search-patches "gcc-5.0-libvtv-runpath.patch"))))))
++ (patches (search-patches "gcc-5.0-libvtv-runpath.patch"
++ "gcc-libiberty-printf-decl.patch"))))
+ ;; GCC 5 ships with .info files, so no need for Texinfo.
+ (native-inputs '())))
;; Note: When changing the default gcc version, update
;; the gcc-toolchain-* definitions accordingly.
diff --cc gnu/packages/linux.scm
index 59258af,a26e641..5f4b041
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -2507,22 -2514,10 +2526,22 @@@ and copy/paste text in the console and
"btrfs-progs-v" version ".tar.xz"))
(sha256
(base32
- "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"))))
+ "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
(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 1db749b,7593fc7..ef06c89
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -98,25 -101,11 +101,24 @@@
version "/Python-" version ".tar.xz"))
(sha256
(base32
- "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw"))
- (patches (search-patches
- "python-2.7-search-paths.patch"
- "python-2-deterministic-build-info.patch"
- "python-2.7-source-date-epoch.patch"))))
+ "0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn"))
- (patches (map search-patch
- '("python-2.7-search-paths.patch"
- "python-2-deterministic-build-info.patch"
- "python-2.7-source-date-epoch.patch")))
++ (patches (search-patches "python-2.7-search-paths.patch"
++ "python-2-deterministic-build-info.patch"
++ "python-2.7-source-date-epoch.patch"))
+ (modules '((guix build utils)))
+ ;; suboptimal to delete failing tests here, but if we delete them in the
+ ;; arguments then we need to make sure to strip out that phase when it
+ ;; gets inherited by python and python-minimal.
+ (snippet
+ '(begin
+ (for-each delete-file
+ '("Lib/test/test_compileall.py"
+ "Lib/test/test_distutils.py"
+ "Lib/test/test_import.py"
+ "Lib/test/test_shutil.py"
+ "Lib/test/test_socket.py"
+ "Lib/test/test_subprocess.py"))
+ #t))))
(outputs '("out"
"tk")) ;tkinter; adds 50 MiB to the closure
(build-system gnu-build-system)
diff --cc gnu/packages/xdisorg.scm
index 7cb4f44,126e997..67bca6d
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@@ -228,8 -232,8 +232,8 @@@ rasterisation."
".tar.bz2"))
(sha256
(base32
- "1i4n7mz49l0j4kr0dg9n1j3hlc786ncqgj0v5fci1mz7pp40m5ki"))
+ "1gnf206zs8dwszvkv4z2hbvh23045z0q29kms127bqrv27hp2nzf"))
- (patches (list (search-patch "libdrm-symbol-check.patch")))))
+ (patches (search-patches "libdrm-symbol-check.patch"))))
(build-system gnu-build-system)
(inputs
`(("libpciaccess" ,libpciaccess)