[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Ricardo Wurmus |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 29 Jun 2018 17:00:18 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit f1728d43460e63b106dd446e70001d8e100eaf6d
Merge: cda7f4b 373cc3b
Author: Ricardo Wurmus <address@hidden>
Date: Fri Jun 29 22:51:23 2018 +0200
Merge branch 'master' into core-updates
.gitignore | 2 +-
Makefile.am | 28 +-
NEWS | 26 +-
README | 3 +-
build-aux/build-self.scm | 126 +-
build-aux/compile-as-derivation.scm | 5 +-
build-aux/hydra/gnu-system.scm | 3 +-
build-aux/hydra/guix-modular.scm | 1 +
build-aux/pre-inst-env.in | 6 +-
configure.ac | 14 +-
doc/contributing.fr.texi | 191 +-
doc/contributing.texi | 21 +-
doc/guix.fr.texi | 6439 ++--
doc/guix.texi | 239 +-
etc/completion/bash/guix-daemon | 30 +
gnu/bootloader/grub.scm | 10 +-
gnu/build/install.scm | 59 +-
gnu/build/linux-modules.scm | 1 +
gnu/build/vm.scm | 104 +-
gnu/local.mk | 37 +-
gnu/packages/admin.scm | 207 +-
gnu/packages/aidc.scm | 5 +-
gnu/packages/algebra.scm | 10 +-
gnu/packages/animation.scm | 17 +-
gnu/packages/astronomy.scm | 4 +-
gnu/packages/audio.scm | 43 +-
gnu/packages/backup.scm | 193 +-
gnu/packages/base.scm | 11 +
gnu/packages/benchmark.scm | 10 +-
gnu/packages/bioconductor.scm | 308 +-
gnu/packages/bioinformatics.scm | 174 +-
gnu/packages/bootloaders.scm | 25 +-
gnu/packages/busybox.scm | 20 +-
gnu/packages/check.scm | 19 +-
gnu/packages/cluster.scm | 81 +
gnu/packages/code.scm | 6 +-
gnu/packages/compression.scm | 77 +-
gnu/packages/cran.scm | 421 +-
gnu/packages/crypto.scm | 27 +-
gnu/packages/cups.scm | 75 +-
gnu/packages/databases.scm | 12 +-
gnu/packages/dav.scm | 5 +-
gnu/packages/debian.scm | 5 +-
gnu/packages/dns.scm | 19 +-
gnu/packages/documentation.scm | 15 +-
gnu/packages/electronics.scm | 5 +-
gnu/packages/elf.scm | 4 +-
gnu/packages/elixir.scm | 36 +-
gnu/packages/emacs.scm | 931 +-
gnu/packages/emulators.scm | 192 +
gnu/packages/engineering.scm | 268 +-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/erlang.scm | 24 +
gnu/packages/fcitx.scm | 18 +-
gnu/packages/file-systems.scm | 11 +-
gnu/packages/firmware.scm | 97 +-
gnu/packages/fltk.scm | 19 +-
gnu/packages/fonts.scm | 24 +-
gnu/packages/fontutils.scm | 18 +-
gnu/packages/fpga.scm | 4 +-
gnu/packages/freedesktop.scm | 7 +-
gnu/packages/ftp.scm | 4 +-
gnu/packages/game-development.scm | 40 +-
gnu/packages/games.scm | 369 +-
gnu/packages/gcc.scm | 15 +
gnu/packages/geo.scm | 4 +-
gnu/packages/gettext.scm | 16 +-
gnu/packages/gimp.scm | 14 +-
gnu/packages/gnome.scm | 49 +-
gnu/packages/gnu-pw-mgr.scm | 14 +-
gnu/packages/gnupg.scm | 32 +-
gnu/packages/gnuzilla.scm | 52 +-
gnu/packages/golang.scm | 188 +-
gnu/packages/gps.scm | 2 +-
gnu/packages/graphics.scm | 4 +-
gnu/packages/groovy.scm | 3 +-
gnu/packages/gtk.scm | 41 +-
gnu/packages/guile.scm | 122 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 19 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 40 +-
gnu/packages/java.scm | 140 +-
gnu/packages/kerberos.scm | 56 +-
gnu/packages/libedit.scm | 4 +-
gnu/packages/libreoffice.scm | 140 +-
gnu/packages/libusb.scm | 44 +
gnu/packages/linux.scm | 99 +-
gnu/packages/lisp.scm | 7 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/machine-learning.scm | 90 +-
gnu/packages/mail.scm | 80 +-
gnu/packages/markup.scm | 7 +-
gnu/packages/maths.scm | 20 +-
gnu/packages/maven.scm | 1398 +-
gnu/packages/mes.scm | 12 +-
gnu/packages/monitoring.scm | 26 +
gnu/packages/mpd.scm | 2 +-
gnu/packages/music.scm | 175 +-
gnu/packages/networking.scm | 102 +-
gnu/packages/nickle.scm | 5 +-
gnu/packages/node.scm | 15 +-
gnu/packages/ntp.scm | 3 +-
gnu/packages/ocaml.scm | 3 +-
gnu/packages/opencl.scm | 290 +
gnu/packages/package-management.scm | 145 +-
gnu/packages/parallel.scm | 22 +-
gnu/packages/password-utils.scm | 5 +-
.../patches/beignet-correct-file-names.patch | 32 +
gnu/packages/patches/bind-CVE-2018-5738.patch | 100 +
.../binutils-aarch64-symbol-relocation.patch | 36 +
.../dovecot-trees-support-dovecot-2.3.patch | 60 +
gnu/packages/patches/doxygen-gcc-ice.patch | 25 +
.../patches/elixir-disable-failing-tests.patch | 284 -
gnu/packages/patches/flann-cmake-3.11.patch | 84 +
.../patches/gcc-8-strmov-store-file-names.patch | 110 +
gnu/packages/patches/heimdal-CVE-2017-11103.patch | 45 -
gnu/packages/patches/heimdal-CVE-2017-6594.patch | 85 -
gnu/packages/patches/icecat-bug-1413868-pt1.patch | 663 +
.../java-commons-collections-fix-java8.patch | 299 +
gnu/packages/patches/libreoffice-icu.patch | 126 +
gnu/packages/patches/libtiff-CVE-2018-10963.patch | 40 +
gnu/packages/patches/libtiff-CVE-2018-8905.patch | 61 +
gnu/packages/patches/libyaml-CVE-2014-9130.patch | 30 -
.../patches/maven-generate-component-xml.patch | 171 +
.../maven-generate-javax-inject-named.patch | 31 +
.../patches/mrrescue-support-love-11.patch | 213 +
gnu/packages/patches/mumble-1.2.19-abs.patch | 31 +
.../nyx-show-header-stats-with-python3.patch | 70 +
.../ocaml-enable-ocamldoc-reproducibility.patch | 149 +
gnu/packages/patches/opensmtpd-fix-crash.patch | 44 +
.../patches/openssl-1.0.2-CVE-2018-0495.patch | 215 +
.../patches/openssl-1.0.2-CVE-2018-0732.patch | 50 +
.../patches/openssl-1.1.0-CVE-2018-0495.patch | 152 +
.../patches/openssl-1.1.0-CVE-2018-0732.patch | 50 +
.../patches/password-store-gnupg-compat.patch | 28 -
.../patches/perl-archive-tar-CVE-2018-12015.patch | 36 +
.../python-nose-timer-drop-ordereddict.patch | 44 -
gnu/packages/patches/qemu-CVE-2018-11806.patch | 105 +
gnu/packages/patches/strace-kernel-4.16.patch | 92 -
gnu/packages/patches/upx-fix-CVE-2017-15056.patch | 96 +
gnu/packages/patches/x265-fix-ppc64le-build.patch | 25 +
gnu/packages/pdf.scm | 4 +-
gnu/packages/perl-check.scm | 51 +
gnu/packages/perl-web.scm | 4 +-
gnu/packages/perl.scm | 89 +-
gnu/packages/photo.scm | 8 +-
gnu/packages/python-crypto.scm | 37 +-
gnu/packages/python-web.scm | 12 +-
gnu/packages/python.scm | 259 +-
gnu/packages/qt.scm | 50 +
gnu/packages/rdf.scm | 8 +-
gnu/packages/ruby.scm | 12 +-
gnu/packages/samba.scm | 37 +-
gnu/packages/scheme.scm | 152 +-
gnu/packages/scribus.scm | 14 +-
gnu/packages/sdl.scm | 16 +-
gnu/packages/search.scm | 36 +-
gnu/packages/security-token.scm | 31 +-
gnu/packages/selinux.scm | 5 +-
gnu/packages/smalltalk.scm | 10 +-
gnu/packages/spice.scm | 4 +-
gnu/packages/ssh.scm | 44 +-
gnu/packages/sssd.scm | 5 +-
gnu/packages/statistics.scm | 32 +-
gnu/packages/suckless.scm | 5 +-
gnu/packages/syncthing.scm | 28 -
gnu/packages/syndication.scm | 6 +-
gnu/packages/telephony.scm | 25 +-
gnu/packages/terminals.scm | 34 +
gnu/packages/tex.scm | 21 +-
gnu/packages/time.scm | 4 +-
gnu/packages/tls.scm | 101 +-
gnu/packages/tor.scm | 91 +-
gnu/packages/version-control.scm | 112 +-
gnu/packages/video.scm | 151 +-
gnu/packages/vim.scm | 95 +-
gnu/packages/virtualization.scm | 168 +-
gnu/packages/vpn.scm | 11 +-
gnu/packages/vulkan.scm | 87 +-
gnu/packages/w3m.scm | 5 +-
gnu/packages/web.scm | 238 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 11 +-
gnu/packages/wm.scm | 17 +-
gnu/packages/xdisorg.scm | 93 +-
gnu/packages/xfig.scm | 7 +-
gnu/packages/xml.scm | 24 +-
gnu/packages/xorg.scm | 57 +-
gnu/packages/zile.scm | 9 +-
gnu/services.scm | 213 +-
gnu/services/authentication.scm | 41 +
gnu/services/base.scm | 5 +-
gnu/services/cuirass.scm | 7 +-
gnu/services/cups.scm | 5 +-
gnu/services/dns.scm | 16 +-
gnu/services/networking.scm | 6 +-
gnu/services/pm.scm | 2 +-
gnu/services/shepherd.scm | 40 +-
gnu/services/sound.scm | 34 +-
gnu/services/web.scm | 9 +-
gnu/system.scm | 76 +-
gnu/system/file-systems.scm | 11 +-
gnu/system/install.scm | 16 +-
gnu/system/mapped-devices.scm | 16 +-
gnu/system/shadow.scm | 3 +
gnu/system/vm.scm | 453 +-
gnu/tests/admin.scm | 7 +-
gnu/tests/base.scm | 132 +-
gnu/tests/dict.scm | 7 +-
gnu/tests/mail.scm | 13 +-
gnu/tests/messaging.scm | 14 +-
gnu/tests/nfs.scm | 7 +-
gnu/tests/rsync.scm | 7 +-
gnu/tests/ssh.scm | 8 +-
gnu/tests/version-control.scm | 20 +-
gnu/tests/web.scm | 8 +-
guix/build-system/r.scm | 4 +-
guix/build/compile.scm | 14 +
guix/build/store-copy.scm | 121 +-
guix/build/waf-build-system.scm | 5 +-
guix/config.scm.in | 18 +-
guix/import/cpan.scm | 9 +-
guix/import/cran.scm | 78 +-
guix/import/crate.scm | 4 +-
guix/import/elpa.scm | 61 +-
guix/import/gem.scm | 2 +-
guix/import/github.scm | 19 +-
guix/import/json.scm | 24 +-
guix/import/pypi.scm | 4 +-
guix/import/snix.scm | 4 +-
guix/import/stackage.scm | 2 +-
guix/import/utils.scm | 77 +-
guix/nar.scm | 3 +-
guix/packages.scm | 28 +
guix/profiles.scm | 68 +-
guix/scripts.scm | 4 +-
guix/scripts/gc.scm | 10 +-
guix/scripts/import/cran.scm | 6 +-
guix/scripts/import/elpa.scm | 26 +-
guix/scripts/lint.scm | 23 +-
guix/scripts/offload.scm | 60 +-
guix/scripts/pack.scm | 391 +-
guix/scripts/package.scm | 40 -
guix/scripts/pull.scm | 236 +-
guix/scripts/substitute.scm | 4 +-
guix/scripts/system.scm | 34 +-
guix/self.scm | 443 +-
guix/store.scm | 47 +-
guix/store/database.scm | 235 +-
guix/store/deduplication.scm | 13 +-
{nix/libstore => guix/store}/schema.sql | 0
guix/ui.scm | 35 +-
guix/utils.scm | 6 +
nix/guix-register/guix-register.cc | 254 -
nix/libstore/store-api.cc | 26 -
nix/libstore/store-api.hh | 4 -
nix/local.mk | 21 +-
po/doc/guix-manual.fr.po | 31673 +++++++------------
po/guix/da.po | 1622 +-
po/guix/fr.po | 1376 +-
po/guix/pt_BR.po | 779 +-
po/packages/da.po | 12123 ++++---
po/packages/fr.po | 9059 +++---
scripts/guix.in | 14 +-
tests/gexp.scm | 17 +-
tests/guix-register.sh | 191 -
tests/packages.scm | 15 +
tests/store-database.scm | 45 +-
tests/store-deduplication.scm | 9 +-
tests/store.scm | 22 +-
tests/system.scm | 23 +
272 files changed, 45225 insertions(+), 36112 deletions(-)
diff --cc gnu/packages/kerberos.scm
index 7b16da7,22d74d3..cb14f76
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@@ -6,7 -6,7 +6,8 @@@
;;; Copyright © 2012, 2013 Nikita Karetnikov <address@hidden>
;;; Copyright © 2012, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017 Alex Vong <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/perl.scm
index cfc73c5,afbe597..27b49e6
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@@ -71,6 -74,6 +72,7 @@@
(patches (search-patches
"perl-file-path-CVE-2017-6512.patch"
"perl-no-sys-dirs.patch"
++ "perl-archive-tar-CVE-2018-12015.patch"
"perl-autosplit-default-time.patch"
"perl-deterministic-ordering.patch"
"perl-reproducible-build-date.patch"))))
diff --cc gnu/packages/tex.scm
index 6ce36f8,b290644..98fc9f0
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -174,51 -175,47 +174,54 @@@
(not (or (string-prefix? "aarch64" s)
(string-prefix? "mips64" s))))
#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'configure-ghostscript-executable
- ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows,
- ;; and the "gs" ghostscript executable on Unix. It detects Unix by
- ;; checking for the existence of the /usr/bin directory. Since
- ;; GuixSD does not have /usr/bin, it is also detected as Windows.
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
- (("gswin32c") "gs"))
- (substitute* "texk/texlive/linked_scripts/epstopdf/epstopdf.pl"
- (("\"gs\"")
- (string-append "\"" (assoc-ref inputs "ghostscript")
"/bin/gs\"")))
- #t))
- (add-after 'install 'postint
- (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
- (let* ((out (assoc-ref outputs "out"))
- (share (string-append out "/share"))
- (texlive-extra (assoc-ref inputs "texlive-extra-src"))
- (unpack (assoc-ref %standard-phases 'unpack))
- (patch-source-shebangs
- (assoc-ref %standard-phases 'patch-source-shebangs)))
- ;; Create symbolic links for the latex variants and their
- ;; man pages.
- (with-directory-excursion (string-append out "/bin/")
- (for-each symlink
- '("pdftex" "pdftex" "xetex" "luatex")
- '("latex" "pdflatex" "xelatex" "lualatex")))
- (with-directory-excursion (string-append share "/man/man1/")
- (symlink "luatex.1" "lualatex.1"))
- ;; Unpack texlive-extra and install tlpkg.
- (mkdir "texlive-extra")
- (with-directory-excursion "texlive-extra"
- (apply unpack (list #:source texlive-extra))
- (apply patch-source-shebangs (list #:source texlive-extra))
- (invoke "mv" "tlpkg" share))
- ;; texlua shebangs are not patched by the patch-source-shebangs
- ;; phase because the texlua executable does not exist at that
- ;; time.
- (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))
- (with-directory-excursion out
- (patch-source-shebangs))))))))
+ (modify-phases %standard-phases
- (add-after 'unpack 'use-code-for-new-poppler
- (lambda _
- (copy-file "texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc"
- "texk/web2c/pdftexdir/pdftoepdf.cc")
- (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc"
- "texk/web2c/pdftexdir/pdftosrc.cc")
- #t))
- (add-after 'unpack 'fix-unix-detection
++ (add-after 'unpack 'configure-ghostscript-executable
+ ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows,
+ ;; and the "gs" ghostscript executable on Unix. It detects Unix by
+ ;; checking for the existence of the /usr/bin directory. Since
+ ;; GuixSD does not have /usr/bin, it is also detected as Windows.
- (lambda _
++ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
+ (("gswin32c") "gs"))
++ (substitute* "texk/texlive/linked_scripts/epstopdf/epstopdf.pl"
++ (("\"gs\"")
++ (string-append "\"" (assoc-ref inputs "ghostscript")
"/bin/gs\"")))
++ #t))
++ (add-after 'unpack 'use-code-for-new-poppler
++ (lambda _
++ (copy-file "texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc"
++ "texk/web2c/pdftexdir/pdftoepdf.cc")
++ (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc"
++ "texk/web2c/pdftexdir/pdftosrc.cc")
+ #t))
+ (add-after 'install 'postint
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+ (let* ((out (assoc-ref outputs "out"))
+ (share (string-append out "/share"))
+ (texlive-extra (assoc-ref inputs "texlive-extra-src"))
+ (unpack (assoc-ref %standard-phases 'unpack))
+ (patch-source-shebangs
+ (assoc-ref %standard-phases 'patch-source-shebangs)))
+ ;; Create symbolic links for the latex variants and their
+ ;; man pages.
+ (with-directory-excursion (string-append out "/bin/")
+ (for-each symlink
+ '("pdftex" "pdftex" "xetex" "luatex")
+ '("latex" "pdflatex" "xelatex" "lualatex")))
+ (with-directory-excursion (string-append share "/man/man1/")
+ (symlink "luatex.1" "lualatex.1"))
+ ;; Unpack texlive-extra and install tlpkg.
+ (mkdir "texlive-extra")
+ (with-directory-excursion "texlive-extra"
+ (apply unpack (list #:source texlive-extra))
+ (apply patch-source-shebangs (list #:source texlive-extra))
+ (invoke "mv" "tlpkg" share))
+ ;; texlua shebangs are not patched by the patch-source-shebangs
+ ;; phase because the texlua executable does not exist at that
+ ;; time.
+ (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))
+ (with-directory-excursion out
+ (patch-source-shebangs))))))))
(synopsis "TeX Live, a package of the TeX typesetting system")
(description
"TeX Live provides a comprehensive TeX document production system.