From 0b55b036c1cdd5409c638e4ab3efea1deea1b708 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Aug 2022 15:48:30 +0200 Subject: 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. --- gnu/packages/serialization.scm | 60 +++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 16 deletions(-) (limited to 'gnu/packages/serialization.scm') 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 ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2019, 2020 Marius Bakke +;;; Copyright © 2016, 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2016, 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2017 Corentin Bocquillon ;;; Copyright © 2017 Gregor Giesen @@ -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") -- cgit v1.2.3 From 6e2f570cded7b932692ece35a879c5d6db255825 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Aug 2022 00:19:53 +0200 Subject: gnu: cereal: List all licenses that apply. * gnu/packages/serialization.scm (cereal)[license]: Add LICENSE:BOOST, LICENSE:EXPAT, and LICENSE:NON-COPYLEFT. --- gnu/packages/serialization.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/serialization.scm') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 1f2f7ff47f..79c55e2b2f 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -167,7 +167,17 @@ implement RPC protocols.") "Cereal is a header-only C++11 serialization library. Cereal takes arbitrary data types and reversibly turns them into different representations, such as compact binary encodings, XML, or JSON.") - (license license:bsd-3))) + ;; Note: Cereal bundles forked versions of rapidxml and rapidjson + ;; (see include/cereal/external/), so list their licenses too. + (license (list license:bsd-3 ;Cereal itself + ;; The bundled RapidXML is dual Boost/Expat (users choice). + ;; RapidJSON is Expat licensed, and further bundles a + ;; stdint.h with BSD-3. + license:boost1.0 license:expat + ;; Finally, include/cereal/external/base64.hpp has a + ;; home-grown BSD-like license. + (license:non-copyleft + "file://include/cereal/external/LICENSE"))))) ;; Some packages fail with the latest version. Remove this variable ;; when unused. -- cgit v1.2.3