[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Sun, 18 Jun 2017 02:44:16 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 9d4385634d098cc0fb35bfe58179f7d855352e39
Merge: a6aff35 96fd87c
Author: Mark H Weaver <address@hidden>
Date: Sun Jun 18 02:36:51 2017 -0400
Merge branch 'master' into core-updates
.mailmap | 17 +-
Makefile.am | 6 +
build-aux/hydra/gnu-system.scm | 6 +-
doc/guix.texi | 164 ++-
gnu/build/file-systems.scm | 4 +
gnu/build/marionette.scm | 17 +-
gnu/local.mk | 17 +-
gnu/packages.scm | 12 +-
gnu/packages/abiword.scm | 4 +-
gnu/packages/admin.scm | 12 +-
gnu/packages/astronomy.scm | 12 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/bioinformatics.scm | 32 +-
gnu/packages/calcurse.scm | 18 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 4 +-
gnu/packages/crypto.scm | 13 +-
gnu/packages/curl.scm | 4 +-
gnu/packages/databases.scm | 17 +-
gnu/packages/datastructures.scm | 4 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/emacs.scm | 43 +-
gnu/packages/embedded.scm | 26 +-
gnu/packages/engineering.scm | 31 +
gnu/packages/enlightenment.scm | 18 +-
gnu/packages/fonts.scm | 156 +--
gnu/packages/freedesktop.scm | 36 +-
gnu/packages/game-development.scm | 5 +-
gnu/packages/games.scm | 14 +-
gnu/packages/gnome.scm | 159 ++-
gnu/packages/gnunet.scm | 18 +-
gnu/packages/gnuzilla.scm | 81 +-
gnu/packages/haskell.scm | 391 +++++-
gnu/packages/image.scm | 12 +-
gnu/packages/java.scm | 22 +-
gnu/packages/kde.scm | 11 +-
gnu/packages/ldc.scm | 196 +--
gnu/packages/libreoffice.scm | 5 +-
gnu/packages/lighting.scm | 4 +-
gnu/packages/linux.scm | 41 +-
gnu/packages/mail.scm | 13 +-
gnu/packages/mate.scm | 27 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/networking.scm | 17 +-
gnu/packages/patches/crawl-upgrade-saves.patch | 83 ++
gnu/packages/patches/gcc-4.6-gnu-inline.patch | 65 +
gnu/packages/patches/gspell-dash-test.patch | 20 +-
.../patches/guile-ssh-channel-finalization.patch | 28 +
gnu/packages/patches/libextractor-ffmpeg-3.patch | 360 ------
gnu/packages/patches/libmwaw-CVE-2017-9433.patch | 33 +
.../patches/nss-disable-long-b64-tests.patch | 34 -
.../patches/nss-increase-test-timeout.patch | 6 +-
gnu/packages/patches/osip-CVE-2017-7853.patch | 40 +
gnu/packages/patches/zziplib-CVE-2017-5974.patch | 28 +
gnu/packages/patches/zziplib-CVE-2017-5975.patch | 32 +
gnu/packages/patches/zziplib-CVE-2017-5976.patch | 61 +
gnu/packages/patches/zziplib-CVE-2017-5978.patch | 37 +
gnu/packages/patches/zziplib-CVE-2017-5979.patch | 19 +
gnu/packages/patches/zziplib-CVE-2017-5981.patch | 19 +
gnu/packages/photo.scm | 19 +-
gnu/packages/python.scm | 70 +-
gnu/packages/ruby.scm | 4 +-
gnu/packages/selinux.scm | 10 +-
gnu/packages/shells.scm | 6 +-
gnu/packages/ssh.scm | 3 +-
gnu/packages/statistics.scm | 4 +-
gnu/packages/telephony.scm | 8 +-
gnu/packages/tex.scm | 1274 +++++++++++++++++++-
gnu/packages/tmux.scm | 46 +
gnu/packages/version-control.scm | 4 +-
gnu/packages/video.scm | 5 +-
gnu/packages/web.scm | 49 +
gnu/packages/xfce.scm | 1 +
gnu/packages/xml.scm | 16 +-
gnu/packages/zip.scm | 6 +
gnu/services/admin.scm | 116 +-
gnu/services/cuirass.scm | 9 +
gnu/system/vm.scm | 10 +-
gnu/tests/base.scm | 20 +-
gnu/tests/messaging.scm | 18 +-
gnu/tests/ssh.scm | 18 +-
guix/build-system/texlive.scm | 164 +++
guix/build/syscalls.scm | 123 ++
guix/build/texlive-build-system.scm | 89 ++
guix/derivations.scm | 47 +-
guix/discovery.scm | 61 +-
guix/grafts.scm | 2 +-
guix/import/pypi.scm | 6 +-
guix/import/texlive.scm | 182 +++
guix/licenses.scm | 71 ++
guix/packages.scm | 6 +-
guix/scripts/build.scm | 4 +-
guix/scripts/graph.scm | 8 +-
guix/scripts/import.scm | 2 +-
guix/scripts/import/texlive.scm | 101 ++
guix/scripts/offload.scm | 5 +-
guix/scripts/package.scm | 76 +-
guix/scripts/perform-download.scm | 4 +-
guix/scripts/publish.scm | 6 +-
guix/store.scm | 39 +-
guix/svn-download.scm | 23 +-
guix/ui.scm | 35 +-
tests/discovery.scm | 4 +
tests/pypi.scm | 6 +-
tests/syscalls.scm | 60 +
tests/texlive.scm | 115 ++
106 files changed, 4334 insertions(+), 1191 deletions(-)
diff --cc gnu/packages/curl.scm
index 420b9ba,a9f219b..af15aa3
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -40,14 -40,15 +40,14 @@@
(define-public curl
(package
(name "curl")
- (version "7.54.0")
- (replacement curl-7.54.1)
- (version "7.53.0")
++ (version "7.54.1")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-";
version ".tar.lzma"))
(sha256
(base32
- "02h7qhl8ynp75g1vcaw18ks0gp7nahvvkqck19pb1q0kkw1scsnd"))))
- "1k0i31xygb804c61llhin5wbpcscg4gfqmbxcfkpdr1alwh7igrq"))))
++ "0vnv3cz0s1l5cjby86hm0x6pgzqijmdm97qa9q5px200956z6yib"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.2 MiB of man3 pages