diff options
author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/cpp.scm | |
parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
download | guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to 'gnu/packages/cpp.scm')
-rw-r--r-- | gnu/packages/cpp.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 58345e7c33..3089094eb8 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -273,7 +273,7 @@ combination of these streams.") (define-public xsimd (package (name "xsimd") - (version "7.4.10") + (version "7.5.0") (source (origin (method git-fetch) @@ -281,7 +281,7 @@ combination of these streams.") (url "https://github.com/QuantStack/xsimd") (commit version))) (sha256 - (base32 "097yvxrxdldi5s5m4nsxv8f4gwv9xj42mqig98a1z3hkjj1j2gn5")) + (base32 "0c9pq5vz43j99z83w3b9qylfi66mn749k1afpv5cwfxggbxvy63f")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -775,7 +775,7 @@ standard GNU style syntax for options.") (define-public folly (package (name "folly") - (version "2021.01.25.00") + (version "2021.04.26.00") (source (origin (method git-fetch) (uri (git-reference @@ -784,7 +784,7 @@ standard GNU style syntax for options.") (file-name (git-file-name name version)) (sha256 (base32 - "14dl1g6vf7mc90mcync5h2lp14fwcx8n9h91pmiq6rfgv1fjjrwz")))) + "0s3jb02qjl9f4gfj01pa01cilkfpc4p0gbpn6bg5vcicyj76garg")))) (build-system cmake-build-system) (arguments '(;; Tests must be explicitly enabled |