diff options
author | Marius Bakke <marius@gnu.org> | 2022-08-09 15:48:30 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-08-10 00:28:59 +0200 |
commit | 0b55b036c1cdd5409c638e4ab3efea1deea1b708 (patch) | |
tree | 4cb7dbfe1bfae2782b40628c0b8a4c7aa79bf42c /gnu | |
parent | 4b780d002d8eb79ac0de035c4a3861f1696f6430 (diff) |
gnu: cereal: Update to 1.3.2.
* gnu/packages/serialization.scm (cereal): Update to 1.3.2.
[arguments]: Use G-expression.
(cereal-1.3.0): New variable.
* gnu/packages/bioinformatics.scm (salmon)[inputs]: Change from CEREAL to
CEREAL-1.3.0.
* gnu/packages/engineering.scm (prusa-slicer)[inputs]: Likewise.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/bioinformatics.scm | 2 | ||||
-rw-r--r-- | gnu/packages/engineering.scm | 2 | ||||
-rw-r--r-- | gnu/packages/serialization.scm | 60 |
3 files changed, 46 insertions, 18 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 289079b766..3a40cc2281 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10017,7 +10017,7 @@ The following file formats are supported: (inputs `(("boost" ,boost) ("bzip2" ,bzip2) - ("cereal" ,cereal) + ("cereal" ,cereal-1.3.0) ("curl" ,curl) ("eigen" ,eigen) ("jemalloc" ,jemalloc) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 0e28a0c428..ed87cd8d6a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3222,7 +3222,7 @@ visualization, matrix manipulation.") (list pkg-config)) (inputs (list boost - cereal + cereal-1.3.0 cgal curl dbus diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index cec9b68299..1f2f7ff47f 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2017, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 David Craven <david@craven.ch> -;;; Copyright © 2016, 2019, 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2016, 2019, 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Corentin Bocquillon <corentin@nybble.fr> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> @@ -31,6 +31,7 @@ (define-module (gnu packages serialization) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix hg-download) #:use-module (guix git-download) @@ -132,7 +133,7 @@ implement RPC protocols.") (define-public cereal (package (name "cereal") - (version "1.3.0") + (version "1.3.2") (source (origin (method git-fetch) @@ -142,22 +143,22 @@ implement RPC protocols.") (file-name (git-file-name name version)) (sha256 (base32 - "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) + "02sd90ynya7wg013zwzjr79fsv4bzqgfg9l2mapd4j38rv06gahx")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DSKIP_PORTABILITY_TEST=ON") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'skip-sandbox - (lambda _ - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(sandbox\\)") "")))) - (add-after 'install 'install-doc - (lambda _ - (let ((doc (string-append %output "/share/doc/html"))) - (invoke "make" "doc") - (mkdir-p doc) - (copy-recursively "doc/html" doc))))))) + (list + #:configure-flags #~'("-DSKIP_PORTABILITY_TEST=ON" + ;; Don't bother building the sandbox examples. + "-DSKIP_PERFORMANCE_COMPARISON=ON" + "-DBUILD_SANDBOX=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda _ + (let ((doc (string-append #$output "/share/doc/html"))) + (invoke "make" "doc") + (mkdir-p doc) + (copy-recursively "doc/html" doc))))))) (native-inputs (list doxygen)) (home-page "https://uscilab.github.io/cereal/") @@ -168,6 +169,33 @@ arbitrary data types and reversibly turns them into different representations, such as compact binary encodings, XML, or JSON.") (license license:bsd-3))) +;; Some packages fail with the latest version. Remove this variable +;; when unused. +(define-public cereal-1.3.0 + (package + (inherit cereal) + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/USCiLab/cereal") + (commit (string-append "v" version)))) + (file-name (git-file-name "cereal" version)) + (sha256 + (base32 + "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) + (arguments + (substitute-keyword-arguments (package-arguments cereal) + ((#:configure-flags flags #~'()) + #~'("-DSKIP_PORTABILITY_TEST=ON")) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'configure 'skip-sandbox + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(sandbox\\)") "")))))))))) + (define-public msgpack (package (name "msgpack") |