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/jupyter.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/jupyter.scm') diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index fbb4367ea5..e65a8bd6c9 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -30,7 +30,6 @@ (define-module (gnu packages jupyter) #: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 @@ (define-public xeus ("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) -- cgit v1.2.3