TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: Rename json-modern-cxx to nlohmann-json.

Browse source 
* gnu/packages/cpp.scm (nlohmann-json): New variable.
(json-modern-cxx): Mark as deprecated alias.
(xtl, jsonnet)[inputs]: Use nlohmann-json.
* gnu/packages/build-tools.scm (bear)[inputs]: Likewise.
* gnu/packages/cybersecurity.scm (blacksmith)[inputs]: Likewise.
* gnu/packages/databases.scm (sqlitebrowser)[inputs]: Adjust comment.
* gnu/packages/games.scm (openrct2)[inputs]: Use nlohmann-json.
* gnu/packages/graphics.scm (f3d)[native-inputs]: Likewise.
* gnu/packages/hardware.scm (openrgb)[inputs]: Likewise.
[arguments]: Adjust accordingly.
* gnu/packages/image-processing.scm (paraview)[inputs]: Adjust comment.
* gnu/packages/irods.scm (irods, irods-client-icommands)[inputs]: Use
nlohmann-json.
* gnu/packages/jupyter.scm (xeus)[inputs]: Likewise.
* gnu/packages/messaging.scm (mtxclient, nheko)[inputs]: Likewise.
* gnu/packages/text-editors.scm (jucipp)[inputs]: Likewise.
* gnu/packages/video.scm (mktoolnix)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (nwg-launchers)[inputs]: Likewise.
This commit is contained in:
Liliana Marie Prikler 2023-04-27 20:57:58 +02:00
parent 3c8d0f9e71
commit 58e84ec9af
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
14 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/build-tools.scm
View file

@ -148,7 +148,7 @@ (define-public bear
`(("c-ares" ,c-ares)
("fmt" ,fmt-8)
("grpc" ,grpc)
("json-modern-cxx" ,json-modern-cxx)
("nlohmann-json" ,nlohmann-json)
("protobuf" ,protobuf)
("python" ,python-wrapper)
("re2" ,re2)

13
gnu/packages/cpp.scm
View file

@ -596,9 +596,9 @@ (define-public json-dto
data transfer object.")
(license license:bsd-3)))
(define-public json-modern-cxx
(define-public nlohmann-json
(package
(name "json-modern-cxx")
(name "nlohmann-json")
(version "3.10.5")
(home-page "https://github.com/nlohmann/json")
(source
@ -662,10 +662,13 @@ (define-public json-modern-cxx
(inputs
(list doctest fifo-map))
(synopsis "JSON parser and printer library for C++")
(description "JSON for Modern C++ is a C++ JSON library that provides
(description "@code{nlohmann::json} is a C++ JSON library that provides
intuitive syntax and trivial integration.")
(license license:expat)))
(define-public json-modern-cxx
(deprecated-package "json-modern-cxx" nlohmann-json))
(define-public xtl
(package
(name "xtl")
@ -681,7 +684,7 @@ (define-public xtl
"134pgvmf9cx5dxs0m0m3qhp3m3r1gl86ic3xax21zc4sdj8sdq46"))
(file-name (git-file-name name version))))
(native-inputs
(list doctest googletest json-modern-cxx))
(list doctest googletest nlohmann-json))
(arguments
'(#:configure-flags
'("-DBUILD_TESTS=ON")
@ -1860,7 +1863,7 @@ (define-public jsonnet
(native-inputs
(list googletest pkg-config))
(inputs
(list json-modern-cxx))
(list nlohmann-json))
(home-page "https://jsonnet.org/")
(synopsis "Data templating language")
(description "Jsonnet is a templating language extending JSON

2
gnu/packages/cybersecurity.scm
View file

@ -89,7 +89,7 @@ (define-public blacksmith
(native-inputs
(list pkg-config))
(inputs
(list argagg asmjit json-modern-cxx))
(list argagg asmjit nlohmann-json))
(home-page "https://comsec.ethz.ch/research/dram/blacksmith")
(synopsis "Rowhammer fuzzer with non-uniform and frequency-based patterns")
(description

2
gnu/packages/databases.scm
View file

@ -5013,7 +5013,7 @@ (define-public sqlitebrowser
(build-system qt-build-system)
(arguments
(list #:configure-flags
;; TODO: Unbundle json (json-modern-cxx).
;; TODO: Unbundle json (nlohmann-json).
#~(list (string-append "-DQSCINTILLA_INCLUDE_DIR="
#$(this-package-input "qscintilla")
"/include/Qsci")

2
gnu/packages/games.scm
View file

@ -4893,7 +4893,7 @@ (define-public openrct2
("freetype" ,freetype)
("icu4c" ,icu4c)
("jansson" ,jansson)
("json-modern-cxx" ,json-modern-cxx)
("nlohmann-json" ,nlohmann-json)
("libpng" ,libpng)
("libzip" ,libzip)
("mesa" ,mesa)

2
gnu/packages/graphics.scm
View file

@ -2535,7 +2535,7 @@ (define-public f3d
(native-inputs
(list cxxopts
help2man
json-modern-cxx))
nlohmann-json))
(inputs
(list alembic
assimp

4
gnu/packages/hardware.scm
View file

@ -1059,7 +1059,7 @@ (define-public openrgb
(string-append #$(this-package-input "hueplusplus")
"/include/hueplusplus"))
(("dependencies/json")
(string-append #$(this-package-input "json-modern-cxx")
(string-append #$(this-package-input "nlohmann-json")
"/include/nlohmann")))))
;; Call qmake instead of configure to create a Makefile.
(replace 'configure
@ -1067,7 +1067,7 @@ (define-public openrgb
(inputs
(list hidapi
hueplusplus
json-modern-cxx
nlohmann-json
libusb
mbedtls-apache
qtbase-5))

2
gnu/packages/image-processing.scm
View file

@ -1213,7 +1213,7 @@ (define-public paraview
glew
gmsh
hdf5
;;json-modern-cxx ;For ParFlow; build fails
;;nlohmann-json ;For ParFlow; build fails
jsoncpp
libjpeg-turbo
libogg

4
gnu/packages/irods.scm
View file

@ -143,7 +143,7 @@ (define-public irods
("boost" ,boost-for-irods)
("cppzmq" ,cppzmq)
("fmt" ,fmt-6)
("json" ,json-modern-cxx)
("json" ,nlohmann-json)
("libarchive" ,libarchive)
("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi
("linux-pam" ,linux-pam)
@ -247,7 +247,7 @@ (define-public irods-client-icommands
("cppzmq" ,cppzmq)
("fmt" ,fmt-6)
("irods" ,irods)
("json" ,json-modern-cxx)
("json" ,nlohmann-json)
("libarchive" ,libarchive)
("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi
("mit-krb5" ,mit-krb5)

2
gnu/packages/jupyter.scm
View file

@ -196,7 +196,7 @@ (define-public xeus
python-jupyter-client))
(inputs
(list xtl
json-modern-cxx
nlohmann-json
cppzmq
zeromq
openssl

4
gnu/packages/messaging.scm
View file

@ -2325,7 +2325,7 @@ (define-public mtxclient
(list boost
coeurl
curl
json-modern-cxx
nlohmann-json
libevent
libsodium
olm
@ -2408,7 +2408,7 @@ (define-public nheko
gst-plugins-base
gst-plugins-bad ; sdp & webrtc for voip
gst-plugins-good-qt ; rtpmanager for voip
json-modern-cxx
nlohmann-json
libevent
libnice ; for voip
olm

2
gnu/packages/text-editors.scm
View file

@ -393,7 +393,7 @@ (define-public jucipp
clang-11 ;XXX: must be the same version as Mesas LLVM
gtkmm-3
gtksourceviewmm
json-modern-cxx
nlohmann-json
libgit2
universal-ctags))
(synopsis "Lightweight C++ IDE")

2
gnu/packages/video.scm
View file

@ -1028,7 +1028,7 @@ (define-public mkvtoolnix
("gettext" ,gettext-minimal)
("googletest" ,googletest)
("libxslt" ,libxslt)
("json-modern-cxx" ,json-modern-cxx)
("nlohmann-json" ,nlohmann-json)
("perl" ,perl)
("pkg-config" ,pkg-config)
("po4a" ,po4a)

2
gnu/packages/xdisorg.scm
View file

@ -3149,7 +3149,7 @@ (define-public nwg-launchers
(base32
"0hq2qiqxvrw3g515ywcb676ljc8mdw3pyslgxr3vahizfljah1pv"))))
(build-system meson-build-system)
(native-inputs (list json-modern-cxx pkg-config))
(native-inputs (list nlohmann-json pkg-config))
(inputs (list gtk-layer-shell gtkmm-3 librsvg))
(home-page "https://github.com/nwg-piotr/nwg-launchers")
(synopsis "Application launchers for wlroots")