[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/17: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/17: Merge branch 'master' into core-updates |
|
Date: |
Wed, 1 May 2019 18:40:30 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 3b458d5462e6bbd852c2dc5c6670d5655abf53f5
Merge: 2ca3fdc 14da3da
Author: Marius Bakke <address@hidden>
Date: Wed May 1 23:11:41 2019 +0200
Merge branch 'master' into core-updates
.gitignore | 2 +
Makefile.am | 33 +-
NEWS | 84 +-
bootstrap | 14 +
build-aux/build-self.scm | 13 +-
build-aux/compile-all.scm | 17 +-
configure.ac | 8 -
doc/contributing.de.texi | 1008 -
doc/contributing.fr.texi | 1005 -
doc/contributing.texi | 7 +-
doc/guix.de.texi | 25126 -------
doc/guix.fr.texi | 25303 -------
doc/guix.texi | 979 +-
doc/local.mk | 22 +-
etc/completion/bash/guix | 11 +-
.../text-mode/guix-commit-message-rename-package | 20 +
gnu.scm | 3 +-
gnu/bootloader.scm | 43 +-
gnu/bootloader/depthcharge.scm | 107 +
gnu/bootloader/grub.scm | 35 +
gnu/bootloader/u-boot.scm | 2 +-
gnu/build/accounts.scm | 9 +-
gnu/build/file-systems.scm | 2 +
gnu/build/linux-boot.scm | 15 +-
gnu/build/linux-container.scm | 48 +-
gnu/build/vm.scm | 30 +-
gnu/installer.scm | 99 +-
gnu/installer/final.scm | 90 +-
gnu/installer/keymap.scm | 8 +-
gnu/installer/locale.scm | 21 +-
gnu/installer/newt/final.scm | 28 +-
gnu/installer/newt/keymap.scm | 45 +-
gnu/installer/newt/locale.scm | 54 +-
gnu/installer/newt/network.scm | 7 +-
gnu/installer/newt/page.scm | 76 +-
gnu/installer/newt/partition.scm | 36 +-
gnu/installer/newt/services.scm | 80 +-
gnu/installer/newt/timezone.scm | 5 +-
gnu/installer/newt/user.scm | 99 +-
gnu/installer/newt/welcome.scm | 8 +-
gnu/installer/newt/wifi.scm | 3 +-
gnu/installer/parted.scm | 55 +-
gnu/installer/services.scm | 158 +-
gnu/installer/steps.scm | 28 +-
gnu/installer/user.scm | 31 +-
gnu/installer/utils.scm | 38 +-
gnu/local.mk | 56 +-
gnu/packages.scm | 25 +
gnu/packages/admin.scm | 122 +-
gnu/packages/algebra.scm | 96 +-
gnu/packages/android.scm | 2 +-
gnu/packages/animation.scm | 25 +-
gnu/packages/antivirus.scm | 4 +-
gnu/packages/assembly.scm | 4 +-
gnu/packages/astronomy.scm | 21 +-
gnu/packages/audio.scm | 78 +-
.../aux-files/linux-libre/5.0-arm-veyron.conf | 4574 ++
gnu/packages/backup.scm | 9 +-
gnu/packages/base.scm | 16 +-
gnu/packages/bioconductor.scm | 1754 +-
gnu/packages/bioinformatics.scm | 636 +-
gnu/packages/bootloaders.scm | 65 +-
gnu/packages/c.scm | 34 +-
gnu/packages/calendar.scm | 18 +-
gnu/packages/cdrom.scm | 130 +-
gnu/packages/check.scm | 65 +-
gnu/packages/chez.scm | 2 +-
gnu/packages/chromium.scm | 163 +-
gnu/packages/commencement.scm | 2 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/conky.scm | 8 +-
gnu/packages/connman.scm | 11 +-
gnu/packages/cpp.scm | 9 +-
gnu/packages/cran.scm | 2409 +-
gnu/packages/crypto.scm | 20 +-
gnu/packages/cups.scm | 8 +-
gnu/packages/curl.scm | 18 -
gnu/packages/databases.scm | 161 +-
gnu/packages/dc.scm | 6 +-
gnu/packages/debug.scm | 20 +-
gnu/packages/dictionaries.scm | 15 +-
gnu/packages/disk.scm | 6 +-
gnu/packages/display-managers.scm | 86 +-
gnu/packages/django.scm | 9 +-
gnu/packages/dlang.scm | 185 +-
gnu/packages/dns.scm | 98 +-
gnu/packages/docker.scm | 11 +-
gnu/packages/dunst.scm | 2 +-
gnu/packages/elf.scm | 8 +-
gnu/packages/emacs-xyz.scm | 4058 +-
gnu/packages/emacs.scm | 6 +-
gnu/packages/embedded.scm | 2 +
gnu/packages/emulators.scm | 169 +-
gnu/packages/engineering.scm | 123 +-
gnu/packages/enlightenment.scm | 21 +-
gnu/packages/entr.scm | 5 +-
gnu/packages/erlang.scm | 19 +
gnu/packages/file-systems.scm | 2 +-
gnu/packages/file.scm | 4 +-
gnu/packages/finance.scm | 36 +-
gnu/packages/firmware.scm | 23 +-
gnu/packages/flashing-tools.scm | 19 +-
gnu/packages/fltk.scm | 4 +-
gnu/packages/fonts.scm | 156 +-
gnu/packages/fpga.scm | 6 +-
gnu/packages/freedesktop.scm | 221 +-
gnu/packages/ftp.scm | 10 +-
gnu/packages/game-development.scm | 123 +-
gnu/packages/games.scm | 1388 +-
gnu/packages/geo.scm | 62 +-
gnu/packages/ghostscript.scm | 11 +-
gnu/packages/gimp.scm | 6 +-
gnu/packages/gl.scm | 4 +-
gnu/packages/gnome.scm | 132 +-
gnu/packages/gnucash.scm | 7 +-
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnupg.scm | 17 +-
gnu/packages/gnuzilla.scm | 162 +-
gnu/packages/golang.scm | 341 +-
gnu/packages/gpodder.scm | 105 +
gnu/packages/graph.scm | 180 +-
gnu/packages/graphics.scm | 56 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 175 +-
gnu/packages/guile.scm | 32 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/haskell-apps.scm | 400 +
gnu/packages/haskell-check.scm | 6 +-
gnu/packages/haskell-crypto.scm | 43 +
gnu/packages/haskell-web.scm | 108 +-
gnu/packages/haskell.scm | 64 +-
gnu/packages/ibus.scm | 37 +-
gnu/packages/idris.scm | 36 +-
gnu/packages/image.scm | 85 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/ipfs.scm | 4 +-
gnu/packages/java.scm | 120 +-
gnu/packages/kde-frameworks.scm | 7 +-
gnu/packages/kde.scm | 87 +-
gnu/packages/kodi.scm | 7 +-
gnu/packages/libedit.scm | 9 +-
gnu/packages/libreoffice.scm | 24 +-
gnu/packages/libusb.scm | 4 +-
gnu/packages/linux.scm | 219 +-
gnu/packages/lirc.scm | 8 +-
gnu/packages/lisp.scm | 1570 +-
gnu/packages/llvm.scm | 39 +
gnu/packages/machine-learning.scm | 586 +-
gnu/packages/mail.scm | 205 +-
gnu/packages/mate.scm | 188 +-
gnu/packages/maths.scm | 514 +-
gnu/packages/maven.scm | 4 +-
gnu/packages/messaging.scm | 42 +-
gnu/packages/microcom.scm | 2 +-
gnu/packages/monitoring.scm | 12 +-
gnu/packages/mp3.scm | 18 +-
gnu/packages/mpd.scm | 10 +-
gnu/packages/mpi.scm | 5 +-
gnu/packages/mtools.scm | 22 +-
gnu/packages/music.scm | 87 +-
gnu/packages/musl.scm | 4 +-
gnu/packages/nano.scm | 6 +-
gnu/packages/ncurses.scm | 8 +-
gnu/packages/networking.scm | 177 +-
gnu/packages/nss.scm | 184 +
gnu/packages/ocaml.scm | 2600 +-
gnu/packages/openldap.scm | 4 +-
gnu/packages/package-management.scm | 40 +-
gnu/packages/parallel.scm | 6 +-
gnu/packages/password-utils.scm | 72 +-
.../bind-fix-unused-pk11-ecc-constants.patch | 43 +
.../patches/docker-use-fewer-modprobes.patch | 137 +
gnu/packages/patches/emacs-undohist-ignored.patch | 27 +
.../patches/emacs-zones-called-interactively.patch | 43 +
gnu/packages/patches/flac-CVE-2017-6888.patch | 29 +
.../patches/grub-efi-fat-serial-number.patch | 27 +
gnu/packages/patches/idris-test-no-node.patch | 61 +
.../patches/knot-include-system-lmdb-header.patch | 34 -
.../patches/kodi-set-libcurl-ssl-parameters.patch | 17 +
gnu/packages/patches/lcms-CVE-2018-16435.patch | 171 +
.../patches/ledger-fix-uninitialized.patch | 27 -
gnu/packages/patches/libopenshot-fixup-tests.patch | 148 -
.../libopenshot-tests-with-system-libs.patch | 95 -
...tch => linkchecker-tests-require-network.patch} | 0
gnu/packages/patches/localed-xorg-keyboard.patch | 322 +
.../patches/mtools-mformat-uninitialized.patch | 20 +
gnu/packages/patches/ntfs-3g-CVE-2019-9755.patch | 72 +
.../patches/ocaml-dose3-Fix-for-ocaml-4.06.patch | 52 +
.../patches/ocaml-dose3-Install-mli-cmx-etc.patch | 133 +
.../patches/ocaml-dose3-add-unix-dependency.patch | 25 +
.../patches/ocaml-dose3-dont-make-printconf.patch | 9 +
gnu/packages/patches/openssh-CVE-2018-20685.patch | 44 -
.../patches/python-pyfakefs-remove-bad-test.patch | 23 +
...on-robotframework-honor-source-date-epoch.patch | 62 +
.../patches/quilt-getopt-nondigit-param.patch | 45 -
.../patches/quilt-getopt-second-separator.patch | 58 -
gnu/packages/patches/quilt-test-fix-regex.patch | 41 -
gnu/packages/patches/reptyr-fix-gcc-7.patch | 38 -
.../patches/soundtouch-CVE-2018-1000223.patch | 143 -
.../patches/soundtouch-CVE-2018-14044-14045.patch | 138 -
.../patches/synfigstudio-fix-ui-with-gtk3.patch | 55 -
.../patches/texlive-bin-CVE-2018-17407.patch | 249 +
.../texlive-bin-pdftex-poppler-compat.patch | 188 -
.../patches/texlive-bin-xetex-poppler-compat.patch | 31 -
.../u-boot-fix-mkimage-header-verification.patch | 57 +
gnu/packages/patches/webkitgtk-sse2.patch | 202 +
gnu/packages/patchutils.scm | 25 +-
gnu/packages/pdf.scm | 5 +-
gnu/packages/perl-check.scm | 133 +-
gnu/packages/perl-web.scm | 59 +-
gnu/packages/perl.scm | 325 +-
gnu/packages/perl6.scm | 21 +-
gnu/packages/photo.scm | 32 +-
gnu/packages/php.scm | 20 +-
gnu/packages/plotutils.scm | 56 +-
gnu/packages/poedit.scm | 80 +
gnu/packages/polkit.scm | 1 +
gnu/packages/pretty-print.scm | 15 +-
gnu/packages/printers.scm | 56 +
gnu/packages/protobuf.scm | 33 +-
gnu/packages/python-crypto.scm | 8 +-
gnu/packages/python-web.scm | 4 +-
gnu/packages/python-xyz.scm | 611 +-
gnu/packages/qt.scm | 14 +-
gnu/packages/rails.scm | 2 +-
gnu/packages/ratpoison.scm | 45 +-
gnu/packages/rdf.scm | 34 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/ruby.scm | 34 +-
gnu/packages/rust.scm | 249 +-
gnu/packages/samba.scm | 17 +-
gnu/packages/scheme.scm | 172 -
gnu/packages/screen.scm | 39 +-
gnu/packages/sdl.scm | 109 +-
gnu/packages/search.scm | 30 +-
gnu/packages/security-token.scm | 224 +-
gnu/packages/serialization.scm | 20 +-
gnu/packages/shellutils.scm | 54 +-
gnu/packages/spice.scm | 47 +-
gnu/packages/ssh.scm | 31 +-
gnu/packages/sssd.scm | 4 +-
gnu/packages/statistics.scm | 176 +-
gnu/packages/storage.scm | 2 +-
gnu/packages/suckless.scm | 7 +-
gnu/packages/sync.scm | 4 +-
gnu/packages/syncthing.scm | 6 +-
gnu/packages/telephony.scm | 377 +
gnu/packages/terminals.scm | 25 +-
gnu/packages/tex.scm | 42 +-
gnu/packages/textutils.scm | 2 +-
gnu/packages/tls.scm | 56 +-
gnu/packages/tmux.scm | 8 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/valgrind.scm | 15 +
gnu/packages/version-control.scm | 475 +-
gnu/packages/video.scm | 84 +-
gnu/packages/vim.scm | 10 +-
gnu/packages/virtualization.scm | 16 +-
gnu/packages/vpn.scm | 18 +-
gnu/packages/vulkan.scm | 80 +-
gnu/packages/w3m.scm | 6 +-
gnu/packages/web-browsers.scm | 6 +-
gnu/packages/web.scm | 168 +-
gnu/packages/webkit.scm | 6 +-
gnu/packages/wget.scm | 11 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/wm.scm | 67 +-
gnu/packages/xdisorg.scm | 22 +-
gnu/packages/xfce.scm | 80 +-
gnu/packages/xiph.scm | 5 +-
gnu/packages/xml.scm | 114 +-
gnu/packages/xorg.scm | 41 +-
gnu/services/authentication.scm | 16 +-
gnu/services/base.scm | 32 +-
gnu/services/certbot.scm | 40 +-
gnu/services/dbus.scm | 48 +
gnu/services/desktop.scm | 70 +-
gnu/services/dns.scm | 87 +-
gnu/services/mail.scm | 45 +-
gnu/services/networking.scm | 15 +-
gnu/services/sddm.scm | 14 +-
gnu/services/shepherd.scm | 26 +-
gnu/services/ssh.scm | 3 +-
gnu/services/web.scm | 1 -
gnu/services/xorg.scm | 320 +-
gnu/system.scm | 109 +-
gnu/system/accounts.scm | 7 +-
.../examples/{bare-bones.tmpl => asus-c201.tmpl} | 25 +-
gnu/system/examples/bare-bones.tmpl | 3 +-
gnu/system/examples/beaglebone-black.tmpl | 3 +-
gnu/system/examples/desktop.tmpl | 23 +-
gnu/system/examples/docker-image.tmpl | 3 +-
gnu/system/examples/lightweight-desktop.tmpl | 3 +-
gnu/system/examples/vm-image.tmpl | 116 +-
gnu/system/install.scm | 131 +-
gnu/system/keyboard.scm | 98 +
gnu/system/linux-container.scm | 68 +-
gnu/system/linux-initrd.scm | 26 +-
gnu/system/shadow.scm | 5 +-
gnu/system/vm.scm | 57 +-
gnu/tests.scm | 5 +-
gnu/tests/install.scm | 19 +-
gnu/tests/networking.scm | 4 +-
guix/build-system/cargo.scm | 9 +-
guix/build-system/dune.scm | 2 +
guix/build-system/linux-module.scm | 175 +
guix/build-system/ocaml.scm | 22 -
guix/build/cargo-build-system.scm | 155 +-
guix/build/clojure-utils.scm | 2 +-
guix/build/dune-build-system.scm | 17 +-
guix/build/go-build-system.scm | 4 +-
guix/build/guile-build-system.scm | 98 +-
guix/build/linux-module-build-system.scm | 91 +
guix/build/po.scm | 69 +
guix/build/ruby-build-system.scm | 2 +
guix/build/syscalls.scm | 4 +-
guix/channels.scm | 1 +
guix/colors.scm | 188 +
guix/config.scm.in | 4 -
guix/derivations.scm | 5 +-
guix/download.scm | 8 +-
guix/gexp.scm | 47 +-
guix/import/opam.scm | 102 +-
guix/licenses.scm | 16 +-
guix/packages.scm | 31 +-
guix/profiles.scm | 15 +
guix/records.scm | 54 +-
guix/scripts.scm | 13 +-
guix/scripts/build.scm | 109 +-
guix/scripts/describe.scm | 8 +-
guix/scripts/environment.scm | 64 +-
guix/scripts/gc.scm | 71 +-
guix/scripts/install.scm | 80 +
guix/scripts/lint.scm | 10 +-
guix/scripts/pack.scm | 8 +-
guix/scripts/package.scm | 21 +-
guix/scripts/pull.scm | 138 +-
guix/scripts/refresh.scm | 6 +-
guix/scripts/remove.scm | 77 +
guix/scripts/search.scm | 67 +
guix/scripts/size.scm | 14 +-
guix/scripts/system.scm | 5 +-
guix/scripts/upgrade.scm | 88 +
guix/self.scm | 138 +-
guix/status.scm | 50 +-
guix/store.scm | 103 +-
guix/store/deduplication.scm | 4 +-
guix/store/roots.scm | 120 +
guix/ui.scm | 258 +-
guix/upstream.scm | 68 +-
po/doc/guix-manual.de.po | 41311 ++++++------
po/doc/{guix-manual.fr.po => guix-manual.es.po} | 67560 ++++++++++---------
po/doc/guix-manual.fr.po | 36074 +++++-----
po/doc/{guix-manual.de.po => guix-manual.zh_CN.po} | 45211 +++++++------
po/doc/local.mk | 8 +-
po/guix/POTFILES.in | 6 +
po/guix/de.po | 2222 +-
po/guix/es.po | 4193 +-
po/guix/fr.po | 2185 +-
po/packages/es.po | 13533 ++--
po/packages/fr.po | 9494 +--
tests/accounts.scm | 10 +-
tests/containers.scm | 11 +
tests/guix-build.sh | 14 +
tests/guix-environment-container.sh | 27 +-
tests/guix-gc.sh | 6 +-
tests/guix-package-aliases.sh | 60 +
tests/pack.scm | 8 +-
tests/records.scm | 58 +
tests/scripts.scm | 1 +
tests/store-roots.scm | 53 +
tests/zlib.scm | 7 +-
372 files changed, 151645 insertions(+), 163170 deletions(-)
diff --cc gnu/local.mk
index 41f42e5,a0f40d1..e6e3279
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -672,8 -682,8 +681,9 @@@ dist_patch_DATA =
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/beets-python-3.7-fix.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
+ %D%/packages/patches/binutils-boot-2.20.1a.patch \
%D%/packages/patches/biber-fix-encoding-write.patch \
+ %D%/packages/patches/bind-fix-unused-pk11-ecc-constants.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blender-2.79-newer-ffmpeg.patch \
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
@@@ -1276,10 -1289,10 +1291,9 @@@
%D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \
%D%/packages/patches/teensy-loader-cli-help.patch \
%D%/packages/patches/teeworlds-use-latest-wavpack.patch \
- %D%/packages/patches/texinfo-perl-compat.patch \
%D%/packages/patches/texinfo-5-perl-compat.patch \
+ %D%/packages/patches/texlive-bin-CVE-2018-17407.patch \
%D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \
- %D%/packages/patches/texlive-bin-pdftex-poppler-compat.patch \
- %D%/packages/patches/texlive-bin-xetex-poppler-compat.patch \
%D%/packages/patches/telegram-purple-adjust-test.patch \
%D%/packages/patches/texi2html-document-encoding.patch \
%D%/packages/patches/texi2html-i18n.patch \
diff --cc gnu/packages/image.scm
index 54ce2d3,4443e1c..08b4be5
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -86,7 -86,8 +86,8 @@@
(define-public libpng
(package
(name "libpng")
- (version "1.6.34")
+ (version "1.6.36")
+ (replacement libpng-1.6.37)
(source (origin
(method url-fetch)
(uri (list (string-append "mirror://sourceforge/libpng/libpng16/"
diff --cc gnu/packages/machine-learning.scm
index 20b8bfa,77e12f8..3e98ac4
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@@ -1249,3 -1305,451 +1305,451 @@@ for load balancing, tracing, health che
applicable in last mile of distributed computing to connect devices, mobile
applications and browsers to backend services.")
(license license:asl2.0)))
+
+ ;; Note that Tensorflow includes a "third_party" directory, which seems to not
+ ;; only contain modified subsets of upstream library source code, but also
+ ;; adapter headers provided by Google (such as the fft.h header, which is not
+ ;; part of the upstream project code). The Tensorflow code includes headers
+ ;; from the "third_party" directory. It does not look like we can replace
+ ;; these headers with unmodified upstream files, so we keep them.
+ (define-public tensorflow
+ (package
+ (name "tensorflow")
+ (version "1.9.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tensorflow/tensorflow.git";)
+ (commit (string-append "v" version))))
+ (file-name (string-append "tensorflow-" version "-checkout"))
+ (sha256
+ (base32
+ "0a9kwha395g3wgxfwln5j8vn9nkspmd75xldrlqdq540w996g8xa"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ; no "check" target
+ #:build-type "Release"
+ #:configure-flags
+ (let ((protobuf (assoc-ref %build-inputs "protobuf"))
+ (protobuf:native (assoc-ref %build-inputs "protobuf:native"))
+ (jsoncpp (assoc-ref %build-inputs "jsoncpp"))
+ (snappy (assoc-ref %build-inputs "snappy"))
+ (sqlite (assoc-ref %build-inputs "sqlite")))
+ (list
+ ;; Use protobuf from Guix
+ (string-append "-Dprotobuf_STATIC_LIBRARIES="
+ protobuf "/lib/libprotobuf.so")
+ (string-append "-DPROTOBUF_PROTOC_EXECUTABLE="
+ protobuf:native "/bin/protoc")
+
+ ;; Use snappy from Guix
+ (string-append "-Dsnappy_STATIC_LIBRARIES="
+ snappy "/lib/libsnappy.so")
+ ;; Yes, this is not actually the include directory but a prefix...
+ (string-append "-Dsnappy_INCLUDE_DIR=" snappy)
+
+ ;; Use jsoncpp from Guix
+ (string-append "-Djsoncpp_STATIC_LIBRARIES="
+ jsoncpp "/lib/libjsoncpp.so")
+ ;; Yes, this is not actually the include directory but a prefix...
+ (string-append "-Djsoncpp_INCLUDE_DIR=" jsoncpp)
+
+ ;; Use sqlite from Guix
+ (string-append "-Dsqlite_STATIC_LIBRARIES="
+ sqlite "/lib/libsqlite.a")
+
+ ;; Use system libraries wherever possible. Currently, this
+ ;; only affects zlib.
+ "-Dsystemlib_ALL=ON"
+ "-Dtensorflow_ENABLE_POSITION_INDEPENDENT_CODE=ON"
+ "-Dtensorflow_BUILD_SHARED_LIB=ON"
+ "-Dtensorflow_OPTIMIZE_FOR_NATIVE_ARCH=OFF"
+ "-Dtensorflow_ENABLE_SSL_SUPPORT=OFF"
+ "-Dtensorflow_BUILD_CONTRIB_KERNELS=OFF"))
+ #:make-flags
+ (list "CC=gcc")
+ #:modules ((ice-9 ftw)
+ (guix build utils)
+ (guix build cmake-build-system))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'set-source-file-times-to-1980
+ ;; At the end of the tf_python_build_pip_package target, a ZIP
+ ;; archive should be generated via bdist_wheel, but it fails with
+ ;; "ZIP does not support timestamps before 1980". Luckily,
+ ;; SOURCE_DATE_EPOCH is respected, which we set to some time in
+ ;; 1980.
+ (lambda _ (setenv "SOURCE_DATE_EPOCH" "315532800") #t))
+ ;; See
https://github.com/tensorflow/tensorflow/issues/20517#issuecomment-406373913
+ (add-after 'unpack 'python3.7-compatibility
+ (lambda _
+ (substitute* '("tensorflow/python/eager/pywrap_tfe_src.cc"
+ "tensorflow/python/lib/core/ndarray_tensor.cc"
+ "tensorflow/python/lib/core/py_func.cc")
+ (("PyUnicode_AsUTF8") "(char *)PyUnicode_AsUTF8"))
+ (substitute* "tensorflow/c/eager/c_api.h"
+ (("unsigned char async")
+ "unsigned char is_async"))
+
+ ;; Remove dependency on tensorboard, a complicated but probably
+ ;; optional package.
+ (substitute* "tensorflow/tools/pip_package/setup.py"
+ ((".*'tensorboard >.*") ""))
+ #t))
+ (add-after 'python3.7-compatibility 'chdir
+ (lambda _ (chdir "tensorflow/contrib/cmake") #t))
+ (add-after 'chdir 'disable-downloads
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* (find-files "external" "\\.cmake$")
+ (("GIT_REPOSITORY.*") "")
+ (("GIT_TAG.*") "")
+ (("PREFIX ")
+ "DOWNLOAD_COMMAND \"\"\nPREFIX "))
+
+ ;; Use packages from Guix
+ (let ((grpc (assoc-ref inputs "grpc")))
+ (substitute* "CMakeLists.txt"
+ ;; Sqlite
+ (("include\\(sqlite\\)") "")
+ (("\\$\\{sqlite_STATIC_LIBRARIES\\}")
+ (string-append (assoc-ref inputs "sqlite")
+ "/lib/libsqlite3.so"))
+ (("sqlite_copy_headers_to_destination") "")
+
+ ;; PNG
+ (("include\\(png\\)") "")
+ (("\\$\\{png_STATIC_LIBRARIES\\}")
+ (string-append (assoc-ref inputs "libpng")
+ "/lib/libpng16.so"))
+ (("png_copy_headers_to_destination") "")
+
+ ;; JPEG
+ (("include\\(jpeg\\)") "")
+ (("\\$\\{jpeg_STATIC_LIBRARIES\\}")
+ (string-append (assoc-ref inputs "libjpeg")
+ "/lib/libjpeg.so"))
+ (("jpeg_copy_headers_to_destination") "")
+
+ ;; GIF
+ (("include\\(gif\\)") "")
+ (("\\$\\{gif_STATIC_LIBRARIES\\}")
+ (string-append (assoc-ref inputs "giflib")
+ "/lib/libgif.so"))
+ (("gif_copy_headers_to_destination") "")
+
+ ;; lmdb
+ (("include\\(lmdb\\)") "")
+ (("\\$\\{lmdb_STATIC_LIBRARIES\\}")
+ (string-append (assoc-ref inputs "lmdb")
+ "/lib/liblmdb.so"))
+ (("lmdb_copy_headers_to_destination") "")
+
+ ;; Protobuf
+ (("include\\(protobuf\\)") "")
+ (("protobuf_copy_headers_to_destination") "")
+ (("^ +protobuf") "")
+
+ ;; gRPC
+ (("include\\(grpc\\)")
+ "find_package(grpc REQUIRED NAMES gRPC)")
+ (("list\\(APPEND tensorflow_EXTERNAL_DEPENDENCIES grpc\\)")
"")
+
+ ;; Eigen
+ (("include\\(eigen\\)")
+ (string-append "find_package(eigen REQUIRED NAMES Eigen3)
+ set(eigen_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/eigen_archive "
+ (assoc-ref inputs "eigen")
"/include/eigen3)"))
+ (("^ +eigen") "")
+
+ ;; snappy
+ (("include\\(snappy\\)")
+ "add_definitions(-DTF_USE_SNAPPY)")
+ (("list\\(APPEND tensorflow_EXTERNAL_DEPENDENCIES
snappy\\)") "")
+
+ ;; jsoncpp
+ (("include\\(jsoncpp\\)") "")
+ (("^ +jsoncpp") ""))
+
+ (substitute* "tf_core_framework.cmake"
+ ((" grpc") "")
+ (("\\$\\{GRPC_BUILD\\}/grpc_cpp_plugin")
+ (which "grpc_cpp_plugin"))
+ ;; Link with gRPC libraries
+ (("add_library\\(tf_protos_cc.*" m)
+ (string-append m
+ (format #f
"\ntarget_link_libraries(tf_protos_cc PRIVATE \
+ ~a/lib/libgrpc++_unsecure.a \
+ ~a/lib/libgrpc_unsecure.a \
+ ~a/lib/libaddress_sorting.a \
+ ~a/lib/libgpr.a \
+ ~a//lib/libcares.so
+ )\n"
+ grpc grpc grpc grpc
+ (assoc-ref inputs "c-ares"))))))
+ (substitute* "tf_tools.cmake"
+ (("add_dependencies\\(\\$\\{proto_text.*") ""))
+ ;; Remove dependency on bundled grpc
+ (substitute* "tf_core_distributed_runtime.cmake"
+ (("tf_core_cpu grpc") "tf_core_cpu"))
+
+ ;; This directory is a dependency of many targets.
+ (mkdir-p "protobuf")
+ #t))
+ (add-after 'configure 'unpack-third-party-sources
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; This is needed to configure bundled packages properly.
+ (setenv "CONFIG_SHELL" (which "bash"))
+ (for-each
+ (lambda (name)
+ (let* ((what (assoc-ref inputs (string-append name "-src")))
+ (name* (string-map (lambda (c)
+ (if (char=? c #\-)
+ #\_ c)) name))
+ (where (string-append "../build/" name* "/src/"
name*)))
+ (cond
+ ((string-suffix? ".zip" what)
+ (mkdir-p where)
+ (with-directory-excursion where
+ (invoke "unzip" what)))
+ ((string-suffix? ".tar.gz" what)
+ (mkdir-p where)
+ (invoke "tar" "xf" what
+ "-C" where "--strip-components=1"))
+ (else
+ (let ((parent (dirname where)))
+ (mkdir-p parent)
+ (with-directory-excursion parent
+ (when (file-exists? name*)
+ (delete-file-recursively name*))
+ (copy-recursively what name*)
+ (map make-file-writable
+ (find-files name* ".*"))))))))
+ (list "boringssl"
+ "cub"
+ "double-conversion"
+ "farmhash"
+ "fft2d"
+ "highwayhash"
+ "nsync"
+ "re2"))
+
+ (rename-file "../build/cub/src/cub/cub-1.8.0/"
+ "../build/cub/src/cub/cub/")
+ #t))
+ (add-after 'unpack 'fix-python-build
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (mkdir-p "protobuf-src")
+ (invoke "tar" "xf" (assoc-ref inputs "protobuf:src")
+ "-C" "protobuf-src" "--strip-components=1")
+ (mkdir-p "eigen-src")
+ (invoke "tar" "xf" (assoc-ref inputs "eigen:src")
+ "-C" "eigen-src" "--strip-components=1")
+
+ (substitute* "tensorflow/contrib/cmake/tf_python.cmake"
+ ;; Ensure that all Python dependencies can be found at build
time.
+ (("PYTHONPATH=\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/tf_python" m)
+ (string-append m ":" (getenv "PYTHONPATH")))
+ ;; Take protobuf source files from our source package.
+
(("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/protobuf/src/protobuf/src/google")
+ (string-append (getcwd) "/protobuf-src/src/google")))
+
+ (substitute* '("tensorflow/contrib/cmake/tf_shared_lib.cmake"
+ "tensorflow/contrib/cmake/tf_python.cmake")
+ ;; Take Eigen source files from our source package.
+ (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/eigen/src/eigen/")
+ (string-append (getcwd) "/eigen-src/"))
+ ;; Take Eigen headers from our own package.
+ (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/external/eigen_archive")
+ (string-append (assoc-ref inputs "eigen") "/include/eigen3")))
+
+ ;; Correct the RUNPATH of ops libraries generated for Python.
+ ;; TODO: this doesn't work :(
+ ;;
/gnu/store/...-tensorflow-1.9.0/lib/python3.7/site-packages/tensorflow/contrib/seq2seq/python/ops/lib_beam_search_ops.so:
+ ;; warning: RUNPATH contains bogus entries:
("/tmp/guix-build-tensorflow-1.9.0.drv-0/source/tensorflow/contrib/build")
+ ;;
/gnu/store/...-tensorflow-1.9.0/lib/python3.7/site-packages/tensorflow/contrib/seq2seq/python/ops/lib_beam_search_ops.so:
+ ;; error: depends on 'libpywrap_tensorflow_internal.so', which
+ ;; cannot be found in RUNPATH ...
+ (substitute* "tensorflow/contrib/cmake/tf_cc_ops.cmake"
+ (("set_target_properties.*")
+ (string-append "set_target_properties(${_AT_TARGET}
PROPERTIES \
+ COMPILE_FLAGS ${target_compile_flags} \
+ INSTALL_RPATH_USE_LINK_PATH TRUE \
+ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
+ #t))
+ (add-after 'build 'build-pip-package
+ (lambda* (#:key outputs #:allow-other-keys)
+ (setenv "LDFLAGS"
+ (string-append "-Wl,-rpath="
+ (assoc-ref outputs "out") "/lib"))
+ (invoke "make" "tf_python_build_pip_package")
+ #t))
+ (add-after 'build-pip-package 'install-python
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (wheel (car (find-files "../build/tf_python/dist/"
"\\.whl$"))))
+ (invoke "python" "-m" "pip" "install" wheel
+ (string-append "--prefix=" out))
+
+ ;; XXX: broken RUNPATH, see fix-python-build phase.
+ (delete-file
+ (string-append
+ out "/lib/python3.7/site-packages/tensorflow/contrib/"
+ "seq2seq/python/ops/lib_beam_search_ops.so"))
+ #t))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("protobuf:native" ,protobuf-next) ; protoc
+ ("protobuf:src" ,(package-source protobuf-next))
+ ("eigen:src" ,(package-source eigen-for-tensorflow))
+ ;; The commit hashes and URLs for third-party source code are taken
+ ;; from "tensorflow/workspace.bzl".
+ ("boringssl-src"
+ ,(let ((commit "ee7aa02")
+ (revision "1"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://boringssl.googlesource.com/boringssl";)
+ (commit commit)))
+ (file-name (string-append "boringssl-0-" revision
+ (string-take commit 7)
+ "-checkout"))
+ (sha256
+ (base32
+ "1jf693q0nw0adsic6cgmbdx6g7wr4rj4vxa8j1hpn792fqhd8wgw")))))
+ ("cub-src"
+ ,(let ((version "1.8.0"))
+ (origin
+ (method url-fetch)
+ (uri (string-append
"https://mirror.bazel.build/github.com/NVlabs/";
+ "cub/archive/" version ".zip"))
+ (file-name (string-append "cub-" version ".zip"))
+ (sha256
+ (base32
+ "1hsqikqridb90dkxkjr2918dcry6pfh46ccnwrzawl56aamhdykb")))))
+ ("double-conversion-src"
+ ,(let ((commit "5664746")
+ (revision "1"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/double-conversion.git";)
+ (commit commit)))
+ (file-name
+ (git-file-name "double-conversion"
+ (string-append "0-" revision "."
+ (string-take commit 7))))
+ (sha256
+ (base32
+ "1h5lppqqxcvdg5jq42i5msgwx20ryij3apvmndflngrgdpc04gn1")))))
+ ("farmhash-src"
+ ,(let ((commit "816a4ae622e964763ca0862d9dbd19324a1eaf45"))
+ (origin
+ (method url-fetch)
+ (uri (string-append
+
"https://mirror.bazel.build/github.com/google/farmhash/archive/";
+ commit ".tar.gz"))
+ (file-name (string-append "farmhash-0-" (string-take commit 7)
+ ".tar.gz"))
+ (sha256
+ (base32
+ "185b2xdxl4d4cnsnv6abg8s22gxvx8673jq2yaq85bz4cdy58q35")))))
+ ;; The license notice on the home page at
+ ;; http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html says:
+ ;; Copyright Takuya OOURA, 1996-2001
+ ;;
+ ;; You may use, copy, modify and distribute this code for any purpose
+ ;; (include commercial use) and without fee. Please refer to this
+ ;; package when you modify this code.
+ ;;
+ ;; We take the identical tarball from the Bazel mirror, because the URL
+ ;; at the home page is not versioned and might change.
+ ("fft2d-src"
+ ,(origin
+ (method url-fetch)
+ (uri
"https://mirror.bazel.build/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz";)
+ (file-name "fft2d.tar.gz")
+ (sha256
+ (base32
+ "15jjkfvhqvl2c0753d2di8hz0pyzn598g74wqy79awdrf1y67fsj"))))
+ ("highwayhash-src"
+ ,(let ((commit "be5edafc2e1a455768e260ccd68ae7317b6690ee")
+ (revision "1"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/highwayhash.git";)
+ (commit commit)))
+ (file-name (string-append "highwayhash-0-" revision
+ (string-take commit 7)
+ "-checkout"))
+ (sha256
+ (base32
+ "154jwf98cyy54hldr94pgjn85zynly3abpnc1avmb8a18lzwjyb6")))))
+ ("nsync-src"
+ ,(let ((version "0559ce013feac8db639ee1bf776aca0325d28777")
+ (revision "1"))
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://mirror.bazel.build/";
+ "github.com/google/nsync/archive/"
+ version ".tar.gz"))
+ (file-name (string-append "nsync-0." revision
+ "-" (string-take version 7)
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0qdkyqym34x739mmzv97ah5r7ph462v5xkxqxvidmcfqbi64b132")))))
+ ("re2-src"
+ ,(let ((commit "e7efc48")
+ (revision "1"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/re2";)
+ (commit commit)))
+ (file-name (string-append "re2-0-" revision
+ (string-take commit 7)
+ "-checkout"))
+ (sha256
+ (base32
+ "161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign")))))
+ ("googletest" ,googletest)
+ ("swig" ,swig)
+ ("unzip" ,unzip)))
+ (propagated-inputs
+ `(("python-absl-py" ,python-absl-py)
+ ("python-astor" ,python-astor)
+ ("python-gast" ,python-gast)
+ ("python-grpcio" ,python-grpcio)
+ ("python-numpy" ,python-numpy)
+ ("python-protobuf" ,python-protobuf-next)
+ ("python-six" ,python-six)
+ ("python-termcolo" ,python-termcolor)
+ ("python-wheel" ,python-wheel)))
+ (inputs
- `(("c-ares" ,c-ares-next)
++ `(("c-ares" ,c-ares)
+ ("eigen" ,eigen-for-tensorflow)
+ ("gemmlowp" ,gemmlowp-for-tensorflow)
+ ("lmdb" ,lmdb)
+ ("libjpeg" ,libjpeg)
+ ("libpng" ,libpng)
+ ("giflib" ,giflib)
+ ("grpc" ,grpc)
+ ("jsoncpp" ,jsoncpp-for-tensorflow)
+ ("snappy" ,snappy)
+ ("sqlite" ,sqlite)
+ ("protobuf" ,protobuf-next)
+ ("python" ,python-wrapper)
+ ("zlib" ,zlib)))
+ (home-page "https://tensorflow.org";)
+ (synopsis "Machine learning framework")
+ (description
+ "TensorFlow is a flexible platform for building and training machine
+ learning models. It provides a library for high performance numerical
+ computation and includes high level Python APIs, including both a sequential
+ API for beginners that allows users to build models quickly by plugging
+ together building blocks and a subclassing API with an imperative style for
+ advanced research.")
+ (license license:asl2.0)))
diff --cc gnu/packages/mpd.scm
index 5a9c438,a6f6819..e479ccc
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@@ -100,10 -100,20 +100,10 @@@ interfacing MPD in the C, C++ & Objecti
"/mpd-" version ".tar.xz"))
(sha256
(base32
- "17z580gqwsr4xp3x124aapw96pl8hk91c43ld2x75606rim12kcd"))))
+ "0mwpkbjsljj1khlnnjanvw3pgxbhsdl0bh2k9bxnpijn2gqq7q13"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'...
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'expand-C++-include-path
- ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>.
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((path "CPLUS_INCLUDE_PATH")
- (gcc (assoc-ref inputs "gcc"))
- (c++ (string-append gcc "/include/c++")))
- (setenv path (string-append c++ ":" (getenv path)))
- #t))))))
+ `(#:configure-flags '("-Ddocumentation=true"))) ;the default is
'false'...
(inputs `(("ao" ,ao)
("alsa-lib" ,alsa-lib)
("avahi" ,avahi)
diff --cc gnu/packages/tex.scm
index e42e910,c3ce80c..a6fedd7
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -195,20 -197,11 +197,20 @@@
#t))
(add-after 'unpack 'use-code-for-new-poppler
(lambda _
- (copy-file "texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc"
+ (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc"
"texk/web2c/pdftexdir/pdftoepdf.cc")
- (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc"
+ (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc"
"texk/web2c/pdftexdir/pdftosrc.cc")
#t))
+ (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler
+ (lambda _
+ ;; Adjust for deprecated types in Poppler 0.73.
+ (substitute* (append
+ (find-files "texk/web2c/luatexdir/" "\\.(cc|w)$")
+ '("texk/web2c/pdftexdir/pdftosrc.cc"))
+ (("Guint") "unsigned int")
+ (("Guchar") "unsigned char"))
+ #t))
(add-after 'unpack 'disable-failing-test
(lambda _
;; FIXME: This test fails on 32-bit architectures since Glibc
2.28:
diff --cc gnu/packages/webkit.scm
index c05366f,ce69d0a..ceff9c1
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -59,14 -59,14 +59,16 @@@
(define-public webkitgtk
(package
(name "webkitgtk")
- (version "2.24.0")
- (version "2.20.5")
++ (version "2.24.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/";
name "-" version ".tar.xz"))
++
++ (patches (search-patches "webkitgtk-sse2.patch"))
(sha256
(base32
- "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif"))))
- "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++ "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk"))))
(build-system cmake-build-system)
(outputs '("out" "doc"))
(arguments
- 06/17: gnu: libpng: Remove graft for 1.6.37., (continued)
- 06/17: gnu: libpng: Remove graft for 1.6.37., guix-commits, 2019/05/01
- 15/17: gnu: boost: Update to 1.70.0., guix-commits, 2019/05/01
- 11/17: gnu: python: Update to 3.7.3., guix-commits, 2019/05/01
- 17/17: gnu: python-hypothesis: Update to 4.18.3., guix-commits, 2019/05/01
- 08/17: gnu: harfbuzz: Update to 2.4.0., guix-commits, 2019/05/01
- 13/17: gnu: util-linux: Update to 2.33.2., guix-commits, 2019/05/01
- 10/17: gnu: python-more-itertools: Update to 7.0.0., guix-commits, 2019/05/01
- 12/17: gnu: pixman: Update to 0.38.4., guix-commits, 2019/05/01
- 14/17: gnu: libuv: Update to 1.28.0., guix-commits, 2019/05/01
- 16/17: gnu: python-pytest: Update to 4.4.1., guix-commits, 2019/05/01
- 01/17: Merge branch 'master' into core-updates,
guix-commits <=
- 02/17: gnu: texlive-bin: Adapt to Poppler 0.75., guix-commits, 2019/05/01