[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: |
Mon, 26 Jun 2017 00:02:51 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit ed068b960eeedb92823238783779730319b8ba0e
Merge: a9308ef ffc015b
Author: Mark H Weaver <address@hidden>
Date: Mon Jun 26 00:00:58 2017 -0400
Merge branch 'master' into core-updates
doc/contributing.texi | 6 +
doc/guix.texi | 88 ++++--
gnu/bootloader/extlinux.scm | 20 +-
gnu/local.mk | 23 +-
gnu/packages/abiword.scm | 5 +-
gnu/packages/admin.scm | 10 +-
gnu/packages/adns.scm | 4 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/assembly.scm | 12 +-
gnu/packages/astronomy.scm | 4 +
gnu/packages/audio.scm | 1 -
gnu/packages/avr.scm | 4 +-
gnu/packages/base.scm | 52 +++-
gnu/packages/bioinformatics.scm | 180 ++++++++++++-
gnu/packages/bootloaders.scm | 14 +-
gnu/packages/busybox.scm | 52 ++--
gnu/packages/cdrom.scm | 1 -
gnu/packages/ci.scm | 1 -
gnu/packages/commencement.scm | 6 +-
gnu/packages/compression.scm | 188 ++++++++++++-
gnu/packages/databases.scm | 60 ++++-
gnu/packages/dns.scm | 186 ++++++++++++-
gnu/packages/docbook.scm | 3 +-
gnu/packages/documentation.scm | 3 +-
gnu/packages/ebook.scm | 14 +-
gnu/packages/electronics.scm | 253 ++++++++++++++++++
gnu/packages/emacs.scm | 80 +++++-
gnu/packages/embedded.scm | 9 +-
gnu/packages/engineering.scm | 172 +++++++++++-
gnu/packages/enlightenment.scm | 5 +-
gnu/packages/fonts.scm | 58 ++--
gnu/packages/fpga.scm | 2 +-
gnu/packages/game-development.scm | 96 ++++++-
gnu/packages/games.scm | 177 +++++++++++-
gnu/packages/gl.scm | 1 -
gnu/packages/gnome.scm | 50 +++-
gnu/packages/gnuzilla.scm | 1 -
gnu/packages/graphics.scm | 3 +-
gnu/packages/gstreamer.scm | 28 +-
gnu/packages/guile.scm | 2 +-
gnu/packages/haskell.scm | 5 +-
gnu/packages/image-viewers.scm | 8 +-
gnu/packages/image.scm | 47 ----
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 1 -
gnu/packages/javascript.scm | 51 ++++
gnu/packages/julia.scm | 53 ++--
gnu/packages/kodi.scm | 3 +-
gnu/packages/ldc.scm | 3 +-
gnu/packages/libffcall.scm | 16 +-
gnu/packages/libreoffice.scm | 3 +-
gnu/packages/linux.scm | 117 +++++++-
gnu/packages/mail.scm | 2 +-
gnu/packages/markup.scm | 4 +-
gnu/packages/maths.scm | 17 +-
gnu/packages/mc.scm | 2 +-
gnu/packages/monitoring.scm | 3 +-
gnu/packages/mpd.scm | 3 +-
gnu/packages/music.scm | 18 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 40 +++
gnu/packages/openstack.scm | 29 +-
gnu/packages/password-utils.scm | 46 +++-
.../patches/abiword-wmf-version-lookup-fix.patch | 28 --
.../patches/calibre-dont-load-remote-icons.patch | 45 ----
.../patches/glibc-CVE-2017-1000366-pt1.patch | 36 +++
.../patches/glibc-CVE-2017-1000366-pt2.patch | 124 +++++++++
.../patches/glibc-CVE-2017-1000366-pt3.patch | 206 ++++++++++++++
.../patches/glibc-vectorized-strcspn-guards.patch | 23 ++
gnu/packages/patches/libwmf-CAN-2004-0941.patch | 21 --
gnu/packages/patches/libwmf-CVE-2006-3376.patch | 30 ---
gnu/packages/patches/libwmf-CVE-2007-0455.patch | 15 --
gnu/packages/patches/libwmf-CVE-2007-2756.patch | 20 --
gnu/packages/patches/libwmf-CVE-2007-3472.patch | 63 -----
gnu/packages/patches/libwmf-CVE-2007-3473.patch | 17 --
gnu/packages/patches/libwmf-CVE-2007-3477.patch | 42 ---
gnu/packages/patches/libwmf-CVE-2009-1364.patch | 13 -
gnu/packages/patches/libwmf-CVE-2009-3546.patch | 17 --
.../libwmf-CVE-2015-0848+CVE-2015-4588.patch | 122 ---------
gnu/packages/patches/libwmf-CVE-2015-4695.patch | 60 -----
gnu/packages/patches/libwmf-CVE-2015-4696.patch | 27 --
gnu/packages/patches/qemu-CVE-2017-9524.patch | 287 ++++++++++++++++++++
gnu/packages/photo.scm | 103 ++++++-
gnu/packages/php.scm | 1 -
gnu/packages/pretty-print.scm | 30 ++-
gnu/packages/python.scm | 162 ++++++++---
gnu/packages/qemu.scm | 40 +--
gnu/packages/qt.scm | 9 +
gnu/packages/rust.scm | 35 ++-
gnu/packages/scheme.scm | 1 -
gnu/packages/smalltalk.scm | 4 +-
gnu/packages/statistics.scm | 1 -
gnu/packages/synergy.scm | 2 +-
gnu/packages/tex.scm | 1 -
gnu/packages/textutils.scm | 34 ++-
gnu/packages/tls.scm | 4 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 24 +-
gnu/packages/video.scm | 7 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/web-browsers.scm | 1 -
gnu/packages/web.scm | 13 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 13 +
gnu/packages/wm.scm | 9 +-
gnu/packages/wv.scm | 5 +-
gnu/packages/xdisorg.scm | 7 +-
gnu/packages/xiph.scm | 12 +-
gnu/packages/xml.scm | 1 -
gnu/packages/xorg.scm | 104 +++++++-
gnu/packages/zip.scm | 183 -------------
gnu/services/dns.scm | 20 +-
gnu/services/networking.scm | 3 +-
gnu/tests/install.scm | 92 ++++++-
guix/build-system/ant.scm | 2 +-
guix/build-system/font.scm | 2 +-
guix/download.scm | 2 +-
guix/packages.scm | 2 +-
guix/profiles.scm | 266 ++++++++++++++----
guix/scripts/environment.scm | 7 +
guix/scripts/package.scm | 9 +-
guix/scripts/refresh.scm | 35 ++-
guix/store.scm | 16 +-
guix/ui.scm | 27 ++
nix/nix-daemon/guix-daemon.cc | 152 ++++++++++-
nix/nix-daemon/nix-daemon.cc | 297 ++++++++++-----------
po/packages/POTFILES.in | 1 -
tests/guix-daemon.sh | 12 +
tests/guix-environment.sh | 4 +
tests/profiles.scm | 112 ++++++++
131 files changed, 3982 insertions(+), 1454 deletions(-)
diff --cc gnu/local.mk
index 1ae2a2d,5d024de..5328a80
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -751,20 -778,7 +753,8 @@@ dist_patch_DATA =
%D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \
%D%/packages/patches/libtool-skip-tests2.patch \
%D%/packages/patches/libunwind-CVE-2015-3239.patch \
+ %D%/packages/patches/libunistring-gnulib-multi-core.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \
- %D%/packages/patches/libwmf-CAN-2004-0941.patch \
- %D%/packages/patches/libwmf-CVE-2006-3376.patch \
- %D%/packages/patches/libwmf-CVE-2007-0455.patch \
- %D%/packages/patches/libwmf-CVE-2007-2756.patch \
- %D%/packages/patches/libwmf-CVE-2007-3472.patch \
- %D%/packages/patches/libwmf-CVE-2007-3473.patch \
- %D%/packages/patches/libwmf-CVE-2007-3477.patch \
- %D%/packages/patches/libwmf-CVE-2009-1364.patch \
- %D%/packages/patches/libwmf-CVE-2009-3546.patch \
- %D%/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \
- %D%/packages/patches/libwmf-CVE-2015-4695.patch \
- %D%/packages/patches/libwmf-CVE-2015-4696.patch \
%D%/packages/patches/libxcb-python-3.5-compat.patch \
%D%/packages/patches/libxml2-CVE-2016-4658.patch \
%D%/packages/patches/libxml2-CVE-2016-5131.patch \
diff --cc gnu/packages/image.scm
index 7c4a18a,504df60..149b45d
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -366,52 -383,20 +365,6 @@@ collection of tools for doing simple ma
"See COPYRIGHT in the distribution."))
(home-page "http://www.simplesystems.org/libtiff/";)))
- (define-public libwmf
-(define libtiff-4.0.8
-- (package
- (name "libwmf")
- (version "0.2.8.4")
- (inherit libtiff)
- (version "4.0.8")
-- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/wvware/"
- name "/" version
- "/" name "-" version ".tar.gz"))
- (sha256
- (base32 "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v"))
- (patches
- (search-patches "libwmf-CAN-2004-0941.patch"
- "libwmf-CVE-2006-3376.patch"
- "libwmf-CVE-2007-0455.patch"
- "libwmf-CVE-2007-2756.patch"
- "libwmf-CVE-2007-3472.patch"
- "libwmf-CVE-2007-3473.patch"
- "libwmf-CVE-2007-3477.patch"
- "libwmf-CVE-2009-1364.patch"
- "libwmf-CVE-2009-3546.patch"
- "libwmf-CVE-2015-0848+CVE-2015-4588.patch"
- "libwmf-CVE-2015-4695.patch"
- "libwmf-CVE-2015-4696.patch"))))
-
- (build-system gnu-build-system)
- (inputs
- `(("freetype" ,freetype)
- ("libjpeg" ,libjpeg)
- ("libpng",libpng)
- ("libxml2" ,libxml2)
- ("zlib" ,zlib)))
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- (synopsis "Library for reading images in the Microsoft WMF format")
- (description
- "libwmf is a library for reading vector images in Microsoft's native
- Windows Metafile Format (WMF) and for either (a) displaying them in, e.g., an
X
- window; or (b) converting them to more standard/free file formats such as,
e.g.,
- the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
- (home-page "http://wvware.sourceforge.net/libwmf.html";)
-
- ;; 'COPYING' is the GPLv2, but file headers say LGPLv2.0+.
- (license license:lgpl2.0+)))
- (origin
- (method url-fetch)
- (uri (string-append "ftp://download.osgeo.org/libtiff/tiff-";
- version ".tar.gz"))
- (patches (search-patches "libtiff-tiffgetfield-bugs.patch"))
- (sha256
- (base32
- "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr"))))))
--
(define-public leptonica
(package
(name "leptonica")