From 813fa6e2c91f3d9ad3a83fcc0e99a19488898618 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Nov 2019 15:30:51 +0100 Subject: gnu: json-modern-cxx: Update to 3.7.3. * gnu/packages/cpp.scm (json-modern-cxx): Update to 3.7.3. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 3981f962d70..779b6e088da 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -209,7 +209,7 @@ as ordering relation.") (define-public json-modern-cxx (package (name "json-modern-cxx") - (version "3.7.0") + (version "3.7.3") (home-page "https://github.com/nlohmann/json") (source (origin @@ -218,7 +218,7 @@ as ordering relation.") (commit (string-append "v" version)))) (sha256 (base32 - "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap")) + "04rry1xzis71z5gj1ylcj8b4li5q18zxhcwaviwvi3hx0frzxl9w")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet -- cgit v1.3 From 27bcdfcd65c0333abd2cd7cb412053b78eaaa70c Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Tue, 5 Nov 2019 15:15:31 +0100 Subject: gnu: Add sobjectizer. * gnu/packages/cpp.scm (sobjectizer): New variable. --- gnu/packages/cpp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 779b6e088da..edcbf707bf4 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019 Jan Wielkiewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -375,3 +376,34 @@ for style issues following Google’s C++ style guide. While Google maintains it's own version of the tool, this is a fork that aims to be more responsive and make @code{cpplint} usable in wider contexts.") (license license:bsd-3))) + +(define-public sobjectizer + (package + (name "sobjectizer") + (version "5.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Stiffstream/sobjectizer.git") + (commit (string-append "v." version)))) + (sha256 + (base32 "0jfai7sqxnnjkms38krm7mssj5l79nb3pllkbyj4j581a7l5j6l5")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "dev") + #t))))) + (home-page "https://stiffstream.com/en/products/sobjectizer.html") + (synopsis "Cross-platform actor framework for C++") + (description + "SObjectizer is a cross-platform \"actor frameworks\" for C++. +SObjectizer supports not only the Actor Model but also the Publish-Subscribe +Model and CSP-like channels. The goal of SObjectizer is to simplify +development of concurrent and multithreaded applications in C++.") + (license license:bsd-3))) -- cgit v1.3 From 5005b6a1c98f840aaab78a04f883872bafad8d8e Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 22 Nov 2019 19:24:44 -0600 Subject: gnu: ccls: Update to 0.20190823.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (ccls): Update to 0.20190823.5. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index edcbf707bf4..b35b1b8e261 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -290,7 +290,7 @@ tools (containers, algorithms) used by other QuantStack packages.") (define-public ccls (package (name "ccls") - (version "0.20190823.3") + (version "0.20190823.5") (source (origin (method git-fetch) @@ -298,7 +298,7 @@ tools (containers, algorithms) used by other QuantStack packages.") (url "https://github.com/MaskRay/ccls") (commit version))) (sha256 - (base32 "1sx31zp6q2qc6fz3r78rx34zp2x4blrqzxwbpww71vb6lp1clmdm")) + (base32 "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.3 From 936aa05209402dd399869ffae188db5dd5f67d69 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Nov 2019 21:40:13 +0100 Subject: gnu: Remove duplicate nlohmann-json-cpp package. * gnu/packages/serialization.scm (nlohmann-json-cpp): Move variable ... * gnu/packages/cpp.scm (nlohmann-json-cpp): ... here. Mark as deprecated by JSON-MODERN-CXX. * gnu/packages/jupyter.scm (xeus)[inputs]: Change NLOHMANN-JSON-CPP to JSON-MODERN-CXX. * gnu/packages/video.scm (mkvtoolnix)[inputs]: Likewise. --- gnu/packages/cpp.scm | 3 +++ gnu/packages/jupyter.scm | 3 +-- gnu/packages/serialization.scm | 35 +---------------------------------- gnu/packages/video.scm | 2 +- 4 files changed, 6 insertions(+), 37 deletions(-) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index b35b1b8e261..335f9a65cde 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -253,6 +253,9 @@ as ordering relation.") intuitive syntax and trivial integration.") (license license:expat))) +(define-public nlohmann-json-cpp + (deprecated-package "nlohmann-json-cpp" json-modern-cxx)) + (define-public xtl (package (name "xtl") diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index fbb4367ea5f..e65a8bd6c9e 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -30,7 +30,6 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages serialization) #:use-module (gnu packages time) #:use-module (gnu packages tls)) @@ -168,7 +167,7 @@ Messaging Protocol}.") ("python-jupyter-client" ,python-jupyter-client))) (inputs `(("xtl" ,xtl) - ("nlohmann-json-cpp" ,nlohmann-json-cpp) + ("json-modern-cxx" ,json-modern-cxx) ("cppzmq" ,cppzmq) ("zeromq" ,zeromq) ("openssl" ,openssl) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index a213e4ba0c8..8efad0af869 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) @@ -378,40 +379,6 @@ convert JSON documents to BSON and the opposite. BSON stands for Binary JSON, it is comparable to protobuf.") (license license:asl2.0))) -(define-public nlohmann-json-cpp - (package - (name "nlohmann-json-cpp") - (version "3.7.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nlohmann/json.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap")))) - (build-system cmake-build-system) - (native-inputs - ;; Integer overflow tests like those from - ;; fail when building with - ;; gcc@5. Thus, build with a newer GCC. - `(("gcc" ,gcc-9))) - (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'build 'unset-path-variables - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t))))) - (home-page "https://nlohmann.github.io/json/") - (synopsis "JSON library for C++") - (description - "JSON library for C++ trying to accomplish “Intuitive syntax”, -“Trivial integration”, and “Serious testing”. -However, “Memory efficiency” and “Speed” have not been primary goals.") - (license license:expat))) - (define-public python-ruamel.yaml (package (name "python-ruamel.yaml") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 030280c6246..7b56d8e460c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -428,7 +428,7 @@ H.264 (MPEG-4 AVC) video streams.") ("gettext" ,gettext-minimal) ("googletest" ,googletest) ("libxslt" ,libxslt) - ("nlohmann-json-cpp" ,nlohmann-json-cpp) + ("json-modern-cxx" ,json-modern-cxx) ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) -- cgit v1.3