From 33de9ee42fb53b47a21409aaa1dd1feca61d6b37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Jul 2020 20:51:52 +0200 Subject: gnu: xtl: Update to 0.6.15. * gnu/packages/cpp.scm (xtl): Update to 0.6.15. --- 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 8b4b99d495..5f0eae9673 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -295,7 +295,7 @@ intuitive syntax and trivial integration.") (define-public xtl (package (name "xtl") - (version "0.6.13") + (version "0.6.15") (source (origin (method git-fetch) (uri @@ -304,7 +304,7 @@ intuitive syntax and trivial integration.") (commit version))) (sha256 (base32 - "0py70lm2i3sxzpgca2cic8zfn6dn18q837h76a5fchl2c0kpxm91")) + "0kq88cbcsvgq4hinrzxirqfpfnm3c5a0x0n2309l9zawh8vm33j4")) (file-name (git-file-name name version)))) (native-inputs `(("googletest" ,googletest) -- cgit v1.2.3 From 295b4f7e17e76d0fea929047287e0e84bdca890b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Jul 2020 18:01:46 +0200 Subject: gnu: json-modern-cxx: Update to 3.9.0. * gnu/packages/cpp.scm (json-modern-cxx): Update to 3.9.0. [arguments]: New field. [native-inputs]: Add "json_test_data" origin. --- gnu/packages/cpp.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5f0eae9673..5e83bb69f6 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -246,7 +247,7 @@ as ordering relation.") (define-public json-modern-cxx (package (name "json-modern-cxx") - (version "3.7.3") + (version "3.9.0") (home-page "https://github.com/nlohmann/json") (source (origin @@ -255,7 +256,7 @@ as ordering relation.") (commit (string-append "v" version)))) (sha256 (base32 - "04rry1xzis71z5gj1ylcj8b4li5q18zxhcwaviwvi3hx0frzxl9w")) + "06wmbnwbisbq3rqdbmi297hidvq6q8vs6j4z0a9qpr4sm721lwa6")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet @@ -278,12 +279,51 @@ as ordering relation.") (string-append "#include "))))) #t)))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + (list (string-append "-DJSON_TestDataDirectory=" + (assoc-ref %build-inputs "json_test_data"))) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-pkg-config-install + (lambda _ + ;; This phase can be removed for versions >= 3.9.1. + (substitute* "CMakeLists.txt" + ;; Look for the generated .pc in the right place ... + (("\\$\\{CMAKE_BINARY_DIR\\}/\\$\\{PROJECT_NAME\\}\\.pc") + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc") + ;; ... and install it to the libdir. + (("DESTINATION lib/pkgconfig") + "DESTINATION \"${CMAKE_INSTALL_LIBDIR}/pkgconfig\"")) + #t)) + ;; XXX: When tests are enabled, the install phase will cause + ;; a needless rebuild without the given configure flags, + ;; ultimately creating both $out/lib and $out/lib64. Move + ;; the check phase after install to work around it. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + ;; Some tests need git and a full checkout, skip those. + (invoke "ctest" "-LE" "git_required") + (format #t "test suite not run~%")) + #t))))) (native-inputs `(("amalgamate" ,amalgamate) - ("doctest" ,doctest))) + ("doctest" ,doctest) + ("json_test_data" + ,(let ((version "3.0.0")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nlohmann/json_test_data") + (commit (string-append "v" version)))) + (file-name (git-file-name "json_test_data" version)) + (sha256 + (base32 + "0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv"))))))) (inputs `(("fifo-map" ,fifo-map))) - (build-system cmake-build-system) (synopsis "JSON parser and printer library for C++") (description "JSON for Modern C++ is a C++ JSON library that provides intuitive syntax and trivial integration.") -- cgit v1.2.3 From 7b403575fa4651c69bc8557266b65175d3549c1b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Aug 2020 00:37:14 +0200 Subject: gnu: json-modern-cxx: Update to 3.9.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (json-modern-cxx): Update to 3.9.1. [arguments]: Remove obsolete ‘fix-pkg-config-install’ phase. --- gnu/packages/cpp.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5e83bb69f6..bf89ff12ea 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -247,7 +247,7 @@ as ordering relation.") (define-public json-modern-cxx (package (name "json-modern-cxx") - (version "3.9.0") + (version "3.9.1") (home-page "https://github.com/nlohmann/json") (source (origin @@ -255,8 +255,7 @@ as ordering relation.") (uri (git-reference (url home-page) (commit (string-append "v" version)))) (sha256 - (base32 - "06wmbnwbisbq3rqdbmi297hidvq6q8vs6j4z0a9qpr4sm721lwa6")) + (base32 "0ar4mzp53lskxw3vdzw07f47njcshl3lwid9jfq6l7yx6ds2nyjc")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet @@ -285,17 +284,6 @@ as ordering relation.") (list (string-append "-DJSON_TestDataDirectory=" (assoc-ref %build-inputs "json_test_data"))) #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-pkg-config-install - (lambda _ - ;; This phase can be removed for versions >= 3.9.1. - (substitute* "CMakeLists.txt" - ;; Look for the generated .pc in the right place ... - (("\\$\\{CMAKE_BINARY_DIR\\}/\\$\\{PROJECT_NAME\\}\\.pc") - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc") - ;; ... and install it to the libdir. - (("DESTINATION lib/pkgconfig") - "DESTINATION \"${CMAKE_INSTALL_LIBDIR}/pkgconfig\"")) - #t)) ;; XXX: When tests are enabled, the install phase will cause ;; a needless rebuild without the given configure flags, ;; ultimately creating both $out/lib and $out/lib64. Move -- cgit v1.2.3 From 697e54b2a16575afa9457456fa2a27b0e5895caa Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 10 Aug 2020 20:19:17 +0200 Subject: gnu: Add rttr. * gnu/packages/cpp.scm (rttr): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/cpp.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index bf89ff12ea..6b74bfe04b 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,42 @@ strings, configuration, bit streams, threading, translation, and cross-platform operating system functions.") (license license:zlib))) +(define-public rttr + (package + (name "rttr") + (version "0.9.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rttrorg/rttr/") + (commit (string-append "v" version)))) + (sha256 + (base32 "1yxad8sj40wi75hny8w6imrsx8wjasjmsipnlq559n4b6kl84ijp")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(;; No check target. Setting test-target to "unit_test" runs it twice. + #:tests? #f + #:configure-flags + '("-DBUILD_DOCUMENTATION=OFF" "-DBUILD_EXAMPLES=OFF") + #:phases + (modify-phases %standard-phases + ;; library_test fails in chroot. + (add-after 'unpack 'skip-library-test + (lambda _ + (substitute* "src/unit_tests/unit_tests.cmake" + (("misc/library_test.cpp") "")) + #t))))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/rttrorg/rttr/") + (synopsis "C++ Reflection Library") + (description + "RTTR stands for Run Time Type Reflection. It describes the ability of a +computer program to introspect and modify an object at runtime. It is also +the name of the library itself, which is written in C++.") + (license license:expat))) + (define-public rct (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a") (revision "2")) -- cgit v1.2.3 From 9372337f626610417202ab68ca86994ea4f9cd56 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Aug 2020 03:06:30 +0200 Subject: gnu: xtl: Update to 0.6.16. * gnu/packages/cpp.scm (xtl): Update to 0.6.16. --- 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 6b74bfe04b..78f0f28716 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -360,7 +360,7 @@ intuitive syntax and trivial integration.") (define-public xtl (package (name "xtl") - (version "0.6.15") + (version "0.6.16") (source (origin (method git-fetch) (uri @@ -369,7 +369,7 @@ intuitive syntax and trivial integration.") (commit version))) (sha256 (base32 - "0kq88cbcsvgq4hinrzxirqfpfnm3c5a0x0n2309l9zawh8vm33j4")) + "0hkz01l7fc1m79s02hz86cl9nb4rwdvg255r6aj82gnsx5qvxy2l")) (file-name (git-file-name name version)))) (native-inputs `(("googletest" ,googletest) -- cgit v1.2.3 From 74541d49110c7d15ef1a7c4072ab1b4936055b9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2020 11:59:02 +0200 Subject: gnu: xtl: Update to 0.6.17. * gnu/packages/cpp.scm (xtl): Update to 0.6.17. --- 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 78f0f28716..7d0ff3353c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -360,7 +360,7 @@ intuitive syntax and trivial integration.") (define-public xtl (package (name "xtl") - (version "0.6.16") + (version "0.6.17") (source (origin (method git-fetch) (uri @@ -369,7 +369,7 @@ intuitive syntax and trivial integration.") (commit version))) (sha256 (base32 - "0hkz01l7fc1m79s02hz86cl9nb4rwdvg255r6aj82gnsx5qvxy2l")) + "136djmx4l34ff5z4fw1c866x52vp7k4f8zcnbs49whymxzhzwpw0")) (file-name (git-file-name name version)))) (native-inputs `(("googletest" ,googletest) -- cgit v1.2.3