[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Sat, 21 Mar 2020 17:35:44 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit d19b14c8349ce8cacb62619ab68953265daeeca7
Merge: 680b561 ee4c927
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Mar 21 22:16:02 2020 +0100
Merge branch 'master' into core-updates
doc/guix.texi | 33 +-
gnu/local.mk | 12 +-
gnu/packages/admin.scm | 4 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/base.scm | 10 +-
gnu/packages/bioconductor.scm | 21 +-
gnu/packages/bootloaders.scm | 7 +-
gnu/packages/build-tools.scm | 26 +
gnu/packages/calendar.scm | 58 +
gnu/packages/cedille.scm | 9 +-
gnu/packages/chromium.scm | 8 +-
gnu/packages/code.scm | 3 +-
gnu/packages/cran.scm | 208 +++-
gnu/packages/crates-io.scm | 1114 +++++++++++++++++++-
gnu/packages/crypto.scm | 45 +
gnu/packages/databases.scm | 30 +-
gnu/packages/django.scm | 26 +-
gnu/packages/docker.scm | 11 +-
gnu/packages/emacs-xyz.scm | 190 +---
gnu/packages/flex.scm | 13 -
gnu/packages/freedesktop.scm | 40 +-
gnu/packages/games.scm | 130 +++
gnu/packages/gcc.scm | 29 +-
gnu/packages/geo.scm | 20 +-
gnu/packages/gnome-xyz.scm | 42 +
gnu/packages/gnome.scm | 358 ++-----
gnu/packages/gnupg.scm | 25 +-
gnu/packages/graphics.scm | 2 +-
gnu/packages/graphviz.scm | 2 +-
gnu/packages/gtk.scm | 30 +-
gnu/packages/guile-xyz.scm | 2 +-
gnu/packages/haskell-apps.scm | 26 +-
gnu/packages/haskell-xyz.scm | 70 +-
gnu/packages/hyperledger.scm | 3 +-
gnu/packages/image.scm | 4 +-
gnu/packages/java.scm | 10 +-
gnu/packages/kde-pim.scm | 842 ++++++++++++++-
gnu/packages/kde.scm | 31 +
gnu/packages/libreoffice.scm | 72 +-
gnu/packages/linux.scm | 62 +-
gnu/packages/lisp-xyz.scm | 8 +-
gnu/packages/logging.scm | 4 +-
gnu/packages/lua.scm | 2 +-
gnu/packages/machine-learning.scm | 82 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/networking.scm | 43 +
gnu/packages/ocaml.scm | 10 +-
gnu/packages/opencl.scm | 2 +-
gnu/packages/package-management.scm | 7 +
.../patches/date-output-pkg-config-files.patch | 60 ++
gnu/packages/patches/ffmpeg-prefer-dav1d.patch | 43 +
gnu/packages/patches/foobillard++-pkg-config.patch | 34 +
.../patches/hash-extender-test-suite.patch | 13 +
...kdepim-runtime-Fix-missing-link-libraries.patch | 42 +
.../kdiagram-Fix-missing-link-libraries.patch | 23 +
.../patches/kmail-Fix-missing-link-libraries.patch | 41 +
.../libksieve-Fix-missing-link-libraries.patch | 59 ++
.../patches/python-faker-fix-build-32bit.patch | 36 -
gnu/packages/perl-compression.scm | 6 +-
gnu/packages/php.scm | 8 +-
gnu/packages/python-crypto.scm | 2 +-
gnu/packages/python-xyz.scm | 241 +++--
gnu/packages/rpc.scm | 177 ++++
gnu/packages/rsync.scm | 10 +-
gnu/packages/ruby.scm | 11 +-
gnu/packages/statistics.scm | 8 +-
gnu/packages/time.scm | 27 +-
gnu/packages/version-control.scm | 2 +-
gnu/packages/video.scm | 6 +
gnu/packages/vim.scm | 4 +-
gnu/packages/web.scm | 20 +-
gnu/packages/wm.scm | 11 +-
gnu/packages/xorg.scm | 100 ++
gnu/system/shadow.scm | 10 +-
gnu/tests/install.scm | 8 +-
guix/inferior.scm | 24 +-
guix/lint.scm | 1 +
guix/packages.scm | 37 +-
guix/repl.scm | 86 +-
guix/scripts/package.scm | 2 -
tests/inferior.scm | 3 +
82 files changed, 3894 insertions(+), 1055 deletions(-)
diff --cc gnu/local.mk
index f8414ec,e391903..9db4019
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -807,12 -806,10 +810,13 @@@ dist_patch_DATA =
%D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/cube-nocheck.patch \
+ %D%/packages/patches/curl-use-ssl-cert-env.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
+ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
+ %D%/packages/patches/date-output-pkg-config-files.patch \
%D%/packages/patches/darkice-workaround-fpermissive-error.patch \
+ %D%/packages/patches/datefudge-gettimeofday.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
@@@ -871,15 -866,20 +875,17 @@@
%D%/packages/patches/fasthenry-spSolve.patch \
%D%/packages/patches/fasthenry-spFactor.patch \
%D%/packages/patches/fbreader-curl-7.62.patch \
+ %D%/packages/patches/ffmpeg-prefer-dav1d.patch \
+ %D%/packages/patches/fifengine-swig-compat.patch \
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
- %D%/packages/patches/file-CVE-2018-10360.patch \
- %D%/packages/patches/findutils-gnulib-libio.patch \
%D%/packages/patches/findutils-localstatedir.patch \
- %D%/packages/patches/findutils-makedev.patch \
- %D%/packages/patches/findutils-test-xargs.patch \
+ %D%/packages/patches/findutils-test-rwlock-threads.patch \
%D%/packages/patches/flann-cmake-3.11.patch \
%D%/packages/patches/flint-ldconfig.patch \
+ %D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
- %D%/packages/patches/fribidi-CVE-2019-18397.patch \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-overlapping-headers.patch
\
%D%/packages/patches/gawk-shell.patch \
@@@ -1332,10 -1336,9 +1343,9 @@@
%D%/packages/patches/python-alembic-exceptions-cause.patch \
%D%/packages/patches/python-axolotl-AES-fix.patch \
%D%/packages/patches/python-cairocffi-dlopen-path.patch \
- %D%/packages/patches/python-cffi-x87-stack-clean.patch \
+ %D%/packages/patches/python-cross-compile.patch \
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
%D%/packages/patches/python-configobj-setuptools.patch \
- %D%/packages/patches/python-faker-fix-build-32bit.patch \
%D%/packages/patches/python-flask-restful-werkzeug-compat.patch \
%D%/packages/patches/python-keras-integration-test.patch \
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
diff --cc gnu/packages/crypto.scm
index a338c4d,afe85ae..2b77a79
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@@ -14,7 -14,7 +14,8 @@@
;;; Copyright © 2018 Tim Gesthuizen <address@hidden>
;;; Copyright © 2019 Pierre Neidhardt <address@hidden>
;;; Copyright © 2019 Tanguy Le Carrour <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
+ ;;; Copyright © 2020 Jakub Kądziołka <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gcc.scm
index f465470,3d1ae25..5c5c51a
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -6,8 -6,9 +6,9 @@@
;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2018, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2020 Joseph LaFreniere <address@hidden>
+ ;;; Copyright © 2020 Guy Fleury Iteriteka <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gnome.scm
index f0b4d01,bc78910..ef65c5b
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -2160,245 -2173,98 +2162,84 @@@ dealing with different structured file
library.")
(license license:lgpl2.0+)))
- (define* (computed-origin-method gexp-promise hash-algo hash
- #:optional (name "source")
- #:key (system (%current-system))
- (guile (default-guile)))
- "Return a derivation that executes the G-expression that results
- from forcing GEXP-PROMISE."
- (mlet %store-monad ((guile (package->derivation guile system)))
- (gexp->derivation (or name "computed-origin")
- (force gexp-promise)
- #:graft? #f ;nothing to graft
- #:system system
- #:guile-for-build guile)))
-
- (define librsvg-next-source
- (let* ((version "2.46.4")
- (upstream-source (origin
- (method url-fetch)
- (uri (string-append
"mirror://gnome/sources/librsvg/"
- (version-major+minor version)
"/"
- "librsvg-" version ".tar.xz"))
- (sha256
- (base32
-
"0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl")))))
- (origin
- (method computed-origin-method)
- (file-name (string-append "librsvg-" version ".tar.xz"))
- (sha256 #f)
- (uri
- (delay
- (with-imported-modules '((guix build utils))
- #~(begin
- (use-modules (guix build utils))
- (set-path-environment-variable
- "PATH" '("bin")
- (list "/tmp"
- #+(canonical-package xz)
- #+(canonical-package gzip)
- #+(canonical-package tar)))
- (invoke "tar" "xvf" #+upstream-source)
- (with-directory-excursion (string-append "librsvg-" #$version)
- ;; The following crate(s) are needed in addition to the ones
replaced:
- (begin
- (invoke
- "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C"
"vendor")
- (invoke
- "tar" "xvf" #+(package-source rust-proc-macro2-0.4) "-C"
"vendor")
- (invoke
- "tar" "xvf" #+(package-source rust-quote-0.6) "-C"
"vendor")
- (invoke
- "tar" "xvf" #+(package-source rust-unicode-xid-0.1) "-C"
"vendor")
- (invoke
- "tar" "xvf" #+(package-source rust-maybe-uninit-2.0) "-C"
"vendor"))
- (for-each
- (lambda (crate)
- (delete-file-recursively (string-append "vendor/" (car
crate)))
- (invoke "tar" "xvf" (cdr crate) "-C" "vendor"))
- '(("aho-corasick" . #+(package-source
rust-aho-corasick-0.7))
- ;; alga 0.9
- ("approx" . #+(package-source rust-approx-0.3))
- ("arrayvec" . #+(package-source rust-arrayvec-0.4))
- ("atty" . #+(package-source rust-atty-0.2))
- ("autocfg" . #+(package-source rust-autocfg-1.0))
- ("bitflags" . #+(package-source rust-bitflags-1))
- ;; block 0.1
- ("bstr" . #+(package-source rust-bstr-0.2))
- ("byteorder" . #+(package-source rust-byteorder-1.3))
- ;; cairo-rs 0.7
- ;; cairo-sys-rs 0.9
- ("cast" . #+(package-source rust-cast-0.2))
- ("cfg-if" . #+(package-source rust-cfg-if-0.1))
- ("clap" . #+(package-source rust-clap-2))
- ("cloudabi" . #+(package-source rust-cloudabi-0.0))
- ("criterion" . #+(package-source rust-criterion-0.2))
- ("criterion-plot" . #+(package-source
rust-criterion-plot-0.3))
- ("crossbeam-deque" . #+(package-source
rust-crossbeam-deque-0.7))
- ("crossbeam-epoch" . #+(package-source
rust-crossbeam-epoch-0.8))
- ("crossbeam-queue" . #+(package-source
rust-crossbeam-queue-0.2))
- ("crossbeam-utils" . #+(package-source
rust-crossbeam-utils-0.7))
- ;; cssparser 0.25
- ;; cssparser-macros 0.3
- ("csv" . #+(package-source rust-csv-1.1))
- ("csv-core" . #+(package-source rust-csv-core-0.1))
- ;; data-url 0.1
- ;; downcast-rs 1.0
- ("dtoa" . #+(package-source rust-dtoa-0.4))
- ;; dtoa-short 0.3
- ("either" . #+(package-source rust-either-1.5))
- ("encoding" . #+(package-source rust-encoding-0.2))
- ("encoding-index-japanese" . #+(package-source
rust-encoding-index-japanese-1.20141219))
- ("encoding-index-korean" . #+(package-source
rust-encoding-index-korean-1.20141219))
- ("encoding-index-simpchinese" . #+(package-source
rust-encoding-index-simpchinese-1.20141219))
- ("encoding-index-singlebyte" . #+(package-source
rust-encoding-index-singlebyte-1.20141219))
- ("encoding-index-tradchinese" . #+(package-source
rust-encoding-index-tradchinese-1.20141219))
- ("encoding_index_tests" . #+(package-source
rust-encoding-index-tests-0.1))
- ;; float-cmp 0.5
- ;; fragile 0.3
- ("fuchsia-cprng" . #+(package-source
rust-fuchsia-cprng-0.1))
- ("futf" . #+(package-source rust-futf-0.1))
- ;; gdk-pixbuf 0.7
- ;; gdk-pixbuf-sys 0.9
- ("generic-array" . #+(package-source
rust-generic-array-0.12))
- ;; gio 0.7
- ("gio-sys" . #+(package-source rust-gio-sys-0.9))
- ;; glib 0.8
- ("glib-sys" . #+(package-source rust-glib-sys-0.9))
- ("gobject-sys" . #+(package-source rust-gobject-sys-0.9))
- ("idna" . #+(package-source rust-idna-0.2))
- ("itertools" . #+(package-source rust-itertools-0.8))
- ("itoa" . #+(package-source rust-itoa-0.4))
- ("language-tags" . #+(package-source
rust-language-tags-0.2))
- ("lazy_static" . #+(package-source rust-lazy-static-1))
- ("libc" . #+(package-source rust-libc-0.2))
- ("libm" . #+(package-source rust-libm-0.1))
- ("locale_config" . #+(package-source
rust-locale-config-0.3))
- ("log" . #+(package-source rust-log-0.4))
- ("mac" . #+(package-source rust-mac-0.1))
- ("malloc_buf" . #+(package-source rust-malloc-buf-0.0))
- ;; markup5ever 0.9
- ("matches" . #+(package-source rust-matches-0.1))
- ;; matrixmultiply 0.2
- ("memchr" . #+(package-source rust-memchr-2.2))
- ("memoffset" . #+(package-source rust-memoffset-0.5))
- ;; nalgebra 0.18
- ("new_debug_unreachable" . #+(package-source
rust-new-debug-unreachable-1.0))
- ("nodrop" . #+(package-source rust-nodrop-0.1))
- ("num-complex" . #+(package-source rust-num-complex-0.2))
- ("num-integer" . #+(package-source rust-num-integer-0.1))
- ("num-rational" . #+(package-source
rust-num-rational-0.2))
- ("num-traits" . #+(package-source rust-num-traits-0.2))
- ("num_cpus" . #+(package-source rust-num-cpus-1.10))
- ("objc" . #+(package-source rust-objc-0.2))
- ("objc-foundation" . #+(package-source
rust-objc-foundation-0.1))
- ("objc_id" . #+(package-source rust-objc-id-0.1))
- ;; pango 0.7
- ;; pango-sys 0.9
- ;; pangocairo 0.8
- ;; pangocairo-sys 0.10
- ("percent-encoding" . #+(package-source
rust-percent-encoding-2.1))
- ("phf" . #+(package-source rust-phf-0.7))
- ("phf_codegen" . #+(package-source rust-phf-codegen-0.7))
- ("phf_generator" . #+(package-source
rust-phf-generator-0.7))
- ("phf_shared" . #+(package-source rust-phf-shared-0.7))
- ("pkg-config" . #+(package-source rust-pkg-config-0.3))
- ("precomputed-hash" . #+(package-source
rust-precomputed-hash-0.1))
- ("proc-macro2" . #+(package-source rust-proc-macro2-1.0))
- ;; procedural-masquerade 0.1
- ("quote" . #+(package-source rust-quote-1.0))
- ("rand" . #+(package-source rust-rand-0.6))
- ("rand_chacha" . #+(package-source rust-rand-chacha-0.1))
- ("rand_core-0.3.1" . #+(package-source
rust-rand-core-0.3))
- ("rand_core" . #+(package-source rust-rand-core-0.4))
- ("rand_hc" . #+(package-source rust-rand-hc-0.1))
- ("rand_isaac" . #+(package-source rust-rand-isaac-0.1))
- ("rand_jitter" . #+(package-source rust-rand-jitter-0.1))
- ("rand_os" . #+(package-source rust-rand-os-0.1))
- ("rand_pcg" . #+(package-source rust-rand-pcg-0.1))
- ("rand_xorshift" . #+(package-source
rust-rand-xorshift-0.1))
- ("rand_xoshiro" . #+(package-source
rust-rand-xoshiro-0.1))
- ;; rawpointer 0.2
- ("rayon" . #+(package-source rust-rayon-1.3))
- ("rayon-core" . #+(package-source rust-rayon-core-1.7))
- ;; rctree 0.3
- ("rdrand" . #+(package-source rust-rdrand-0.4))
- ("regex" . #+(package-source rust-regex-1.3))
- ("regex-automata" . #+(package-source
rust-regex-automata-0.1))
- ("regex-syntax" . #+(package-source
rust-regex-syntax-0.6))
- ("rustc_version" . #+(package-source
rust-rustc-version-0.2))
- ("ryu" . #+(package-source rust-ryu-1.0))
- ("same-file" . #+(package-source rust-same-file-1.0))
- ("scopeguard" . #+(package-source rust-scopeguard-1.0))
- ("semver" . #+(package-source rust-semver-0.9))
- ("semver-parser" . #+(package-source
rust-semver-parser-0.7))
- ("serde" . #+(package-source rust-serde-1.0))
- ("serde_derive" . #+(package-source
rust-serde-derive-1.0))
- ("serde_json" . #+(package-source rust-serde-json-1.0))
- ("siphasher" . #+(package-source rust-siphasher-0.2))
- ("smallvec" . #+(package-source rust-smallvec-0.6))
- ("string_cache" . #+(package-source
rust-string-cache-0.7))
- ("string_cache_codegen" . #+(package-source
rust-string-cache-codegen-0.4))
- ("string_cache_shared" . #+(package-source
rust-string-cache-shared-0.3))
- ("syn" . #+(package-source rust-syn-1.0))
- ("tendril" . #+(package-source rust-tendril-0.4))
- ("textwrap" . #+(package-source rust-textwrap-0.11))
- ("thread_local" . #+(package-source
rust-thread-local-1.0))
- ("tinytemplate" . #+(package-source
rust-tinytemplate-1.0))
- ("typenum" . #+(package-source rust-typenum-1.10))
- ("unicode-bidi" . #+(package-source
rust-unicode-bidi-0.3))
- ("unicode-normalization" . #+(package-source
rust-unicode-normalization-0.1))
- ("unicode-width" . #+(package-source
rust-unicode-width-0.1))
- ("unicode-xid" . #+(package-source rust-unicode-xid-0.2))
- ("url" . #+(package-source rust-url-2.1))
- ("utf-8" . #+(package-source rust-utf-8-0.7))
- ("walkdir" . #+(package-source rust-walkdir-2.2))
- ("winapi" . #+(package-source rust-winapi-0.3))
- ("winapi-i686-pc-windows-gnu" . #+(package-source
rust-winapi-i686-pc-windows-gnu-0.4))
- ("winapi-util" . #+(package-source rust-winapi-util-0.1))
- ("winapi-x86_64-pc-windows-gnu" . #+(package-source
rust-winapi-x86-64-pc-windows-gnu-0.4))
- ("xml-rs" . #+(package-source rust-xml-rs-0.8)))))
- (format #t "Replacing vendored crates in the tarball and
repacking ...~%")
- (force-output)
- (invoke "tar" "cfa" #$output
- ;; Avoid non-determinism in the archive. We set the
- ;; mtime of files in the archive to early 1980 because
- ;; the build process fails if the mtime of source
- ;; files is pre-1980, due to the creation of zip
- ;; archives.
- "--mtime=@315619200" ; 1980-01-02 UTC
- "--owner=root:0"
- "--group=root:0"
- "--sort=name"
- (string-append "librsvg-" #$version))
- #t)))))))
-(define librsvg/fixed
- (package
- (inherit librsvg)
- (name "librsvg")
- (version "2.40.21")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))))
--
(define-public librsvg-next
(package
+ (inherit librsvg)
(name "librsvg")
(version "2.46.4")
- (source librsvg-next-source)
- (build-system gnu-build-system)
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/librsvg/"
+ (version-major+minor version) "/"
+ "librsvg-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (delete-file-recursively "vendor")
+ ;; Don't demand an exact version for string_cache
+ (substitute* "rsvg_internals/Cargo.toml"
+ (("\"=") "\""))
+ #t))))
+ (build-system cargo-build-system)
(arguments
- `(#:configure-flags
- (list "--disable-static"
- "--enable-vala") ; needed for e.g. gnome-mines
- #:make-flags '("CC=gcc")
- #:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
+ `(#:modules ((guix build cargo-build-system)
+ (guix build utils)
+ ((guix build gnu-build-system) #:prefix gnu:))
+ #:vendor-dir "vendor"
+ #:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-cairo-rs" ,rust-cairo-rs-0.7)
+ ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9)
+ ("rust-cssparser" ,rust-cssparser-0.25)
+ ("rust-data-url" ,rust-data-url-0.1)
+ ("rust-downcast-rs" ,rust-downcast-rs-1.1)
+ ("rust-encoding" ,rust-encoding-0.2)
+ ("rust-float-cmp" ,rust-float-cmp-0.5)
+ ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.7)
+ ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9)
+ ("rust-gio" ,rust-gio-0.7)
+ ("rust-gio-sys" ,rust-gio-sys-0.9)
+ ("rust-glib" ,rust-glib-0.8)
+ ("rust-glib-sys" ,rust-glib-sys-0.9)
+ ("rust-gobject-sys" ,rust-gobject-sys-0.9)
+ ("rust-itertools" ,rust-itertools-0.8)
+ ("rust-language-tags" ,rust-language-tags-0.2)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-locale-config" ,rust-locale-config-0.3)
+ ("rust-markup5ever" ,rust-markup5ever-0.9)
+ ("rust-nalgebra" ,rust-nalgebra-0.18)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-pkg-config" ,rust-pkg-config-0.3)
+ ("rust-pango" ,rust-pango-0.7)
+ ("rust-pango-sys" ,rust-pango-sys-0.9)
+ ("rust-pangocairo" ,rust-pangocairo-0.8)
+ ("rust-phf" ,rust-phf-0.7)
+ ("rust-rayon" ,rust-rayon-1.3)
+ ("rust-rctree" ,rust-rctree-0.3)
+ ("rust-string-cache" ,rust-string-cache-0.7)
+ ("rust-regex" ,rust-regex-1.3)
+ ("rust-url" ,rust-url-2.1)
+ ("rust-xml-rs" ,rust-xml-rs-0.8))
+ #:cargo-development-inputs
+ (("rust-cairo-rs" ,rust-cairo-rs-0.7)
+ ("rust-criterion" ,rust-criterion-0.2))
#:phases
(modify-phases %standard-phases
- (add-after 'configure 'patch-cargo-checksums
+ (add-after 'unpack 'prepare-for-build
(lambda _
- (use-modules (guix build cargo-utils))
- (substitute* "librsvg/Cargo.toml"
- (("bitflags .*") "bitflags = \"1\"\n")) ; 1.2 is vendored
- (substitute* "rsvg_internals/Cargo.toml"
- (("\"=") "\""))
- (generate-all-checksums "vendor")
- (delete-file "Cargo.lock")
- (invoke "cargo" "generate-lockfile")))
+ ;; In lieu of #:make-flags
+ (setenv "CC" "gcc")
+ ;; Something about the build environment resists building
+ ;; successfully with the '--locked' flag.
+ (substitute* '("Makefile.am"
+ "Makefile.in")
+ (("--locked") ""))
+ #t))
(add-before 'configure 'pre-configure
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda _
(substitute* "gdk-pixbuf-loader/Makefile.in"
;; By default the gdk-pixbuf loader is installed under
;; gdk-pixbuf's prefix. Work around that.
diff --cc gnu/packages/gnupg.scm
index c22eb57,856c01a..e1abcc1
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -13,10 -13,9 +13,10 @@@
;;; Copyright © 2016 Troy Sankey <address@hidden>
;;; Copyright © 2017 Leo Famulari <address@hidden>
;;; Copyright © 2017 Petter <address@hidden>
- ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018, 2019 Marius Bakke <address@hidden>
;;; Copyright © 2018 Björn Höfling <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gtk.scm
index 12530c9,df9fc05..d20d460
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -956,22 -923,19 +957,22 @@@ exceptions, macros, and a dynamic progr
(description
"Guile-RSVG wraps the RSVG library for Guile, allowing you to render
SVG
images onto Cairo surfaces.")
- (home-page "http://wingolog.org/projects/guile-rsvg/";)
+ (home-page "https://wingolog.org/projects/guile-rsvg/";)
(license license:lgpl2.1+))))
-(define-public guile3.0-rsvg
+(define-public guile2.2-rsvg
(package
(inherit guile-rsvg)
- (name "guile3.0-rsvg")
+ (name "guile2.2-rsvg")
(inputs
- `(("guile" ,guile-3.0)
- ("guile-lib" ,guile3.0-lib)
+ `(("guile" ,guile-2.2)
+ ("guile-lib" ,guile2.2-lib)
,@(fold alist-delete (package-inputs guile-rsvg)
'("guile" "guile-lib"))))
- (propagated-inputs `(("guile-cairo" ,guile3.0-cairo)))))
+ (propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))
+
+(define-public guile3.0-rsvg
+ (deprecated-package "guile3.0-rsvg" guile-rsvg))
(define-public guile-present
(package
diff --cc gnu/packages/guile-xyz.scm
index fe99fb9,a2430b7..661a725
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@@ -598,17 -597,14 +598,17 @@@ is not available for Guile 2.0."
highlighting library for GNU Guile. It can parse code written in various
programming languages into a simple s-expression that can be converted to
HTML (via SXML) or any other format for rendering.")
- (home-page "http://dthompson.us/projects/guile-syntax-highlight.html";)
+ (home-page "https://dthompson.us/projects/guile-syntax-highlight.html";)
(license license:lgpl3+)))
-(define-public guile3.0-syntax-highlight
+(define-public guile2.2-syntax-highlight
(package
(inherit guile-syntax-highlight)
- (name "guile3.0-syntax-highlight")
- (inputs `(("guile" ,guile-3.0)))))
+ (name "guile2.2-syntax-highlight")
+ (inputs `(("guile" ,guile-2.2)))))
+
+(define-public guile3.0-syntax-highlight
+ (deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight))
(define-public guile-sjson
(package
diff --cc gnu/packages/machine-learning.scm
index 27b15dd,beb13a8..32aa684
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@@ -1801,10 -1726,11 +1726,11 @@@ INSTALL_RPATH " (assoc-ref outputs "out
("eigen" ,eigen-for-tensorflow)
("gemmlowp" ,gemmlowp-for-tensorflow)
("lmdb" ,lmdb)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("giflib" ,giflib)
- ("grpc:bin" ,grpc)
+ ("grpc" ,grpc-1.16.1 "static")
+ ("grpc:bin" ,grpc-1.16.1)
("jsoncpp" ,jsoncpp-for-tensorflow)
("snappy" ,snappy)
("sqlite" ,sqlite)
diff --cc gnu/packages/php.scm
index 2551028,e58d82d..ff4bd8d
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@@ -1,10 -1,9 +1,10 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Julien Lepiller <address@hidden>
;;; Copyright © 2016 Marius Bakke <address@hidden>
- ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2019 Oleg Pykhalov <address@hidden>
+;;; Copyright © 2020 Maxim Cournoyer <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/ruby.scm
index 0e7d35f,a31f177..87d9852
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -6,9 -6,9 +6,9 @@@
;;; Copyright © 2015, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <address@hidden>
;;; Copyright © 2017 ng0 <address@hidden>
-;;; Copyright © 2017, 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2017, 2019, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <address@hidden>
- ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2017 Clément Lassieur <address@hidden>
;;; Copyright © 2017, 2018, 2019 Christopher Baines <address@hidden>
;;; Copyright © 2018 Vasile Dumitrascu <address@hidden>
diff --cc gnu/packages/web.scm
index 171e836,10cbf61..3f59bbd
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -35,9 -35,7 +35,9 @@@
;;; Copyright © 2019 Alex Griffin <address@hidden>
;;; Copyright © 2019 Hartmut Goebel <address@hidden>
;;; Copyright © 2019 Jakob L. Kreuze <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
- ;;; Copyright © 2019 Florian Pelz <address@hidden>
+ ;;; Copyright © 2019, 2020 Florian Pelz <address@hidden>
;;; Copyright © 2020 Timotej Lazar <address@hidden>
;;; Copyright © 2020 Alexandros Theodotou <address@hidden>
;;; Copyright © 2020 Pierre Neidhardt <address@hidden>
diff --cc gnu/packages/xorg.scm
index 2ec151f,f4c7329..4353a09
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -20,8 -20,8 +20,9 @@@
;;; Copyright © 2018 Benjamin Slade <address@hidden>
;;; Copyright © 2019 nee <address@hidden>
;;; Copyright © 2019 Yoshinori Arai <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Leo Prikler <address@hidden>
+ ;;; Copyright © 2020 Florian Pelz <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;