From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 65371@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#65371] [PATCH telephony-team 05/10] gnu: msgpack: Deprecate with msgpack-c.
Date: Fri, 18 Aug 2023 14:12:56 -0400 [thread overview]
Message-ID: <c03c2aa247e94c24385a2765cc5b6c6352d9696b.1692382380.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <d5d842caf9ce7268ed0d4cd505ef79d76d304864.1692382380.git.maxim.cournoyer@gmail.com>
* gnu/packages/serialization.scm (msgpack-c): New variable.
(msgpack-cxx): New variable.
(msgpack): Rename to...
(msgpack-3): ... this, and inherit from msgpack-c.
* gnu/packages/vim.scm (eovim) [inputs]: Replace msgpack with msgpack-3.
* gnu/packages/terminals.scm (tmate): Likewise.
* gnu/packages/networking.scm (opendht)
[propagated-inputs]: Replace msgpack with msgpack-cxx.
---
gnu/packages/networking.scm | 2 +-
gnu/packages/serialization.scm | 71 +++++++++++++++++++++++++++-------
gnu/packages/terminals.scm | 6 +--
gnu/packages/vim.scm | 6 +--
4 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 55c938606f..a7cb4f876e 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3847,7 +3847,7 @@ (define-public opendht
fmt
readline))
(propagated-inputs
- (list msgpack ;included in several installed headers
+ (list msgpack-cxx ;included in several installed headers
restinio ;included in opendht/http.h
;; The following are listed in the 'Requires.private' field of
;; opendht.pc:
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 9c114aaf39..9f2aab250e 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2023 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -222,8 +223,60 @@ (define-public cereal-1.3.0
(list doxygen gcc-10
(package-source cereal)))))
+(define-public msgpack-c
+ (package
+ (name "msgpack-c")
+ (version "6.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://github.com/msgpack/msgpack-c/releases/download/"
+ "c-" version "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1fmf08babfsjq5qkgw034wk2nw6mayxp1qlkm7h55p2jqvigam1n"))
+ (snippet
+ '(let ((p (open-file "msgpack-c.pc.in" "a")))
+ (display "Requires: zlib\n" p)
+ (close-output-port p)))))
+ (build-system cmake-build-system)
+ (arguments (list #:configure-flags #~(list "-DMSGPACK_BUILD_TESTS=ON")))
+ (native-inputs (list googletest))
+ (propagated-inputs (list zlib)) ;zbuffer.h includes zlib.h
+ (home-page "https://www.msgpack.org")
+ (synopsis "Binary serialization library")
+ (description "Msgpack is a library for C that implements binary
+serialization.")
+ (license license:boost1.0)))
+
+(define-public msgpack-cxx
+ (package
+ (inherit msgpack-c)
+ (name "msgpack-cxx")
+ (version "6.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://github.com/msgpack/msgpack-c/releases/download/"
+ "cpp-" version "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1rrrf3nskcv994z3pbq6a5z2021piz118rccmm1y7zlf7klygv93"))))
+ (build-system cmake-build-system)
+ (propagated-inputs (list boost zlib)) ;included in headers
+ (description "Msgpack is a library for C++ that implements binary
+serialization.")))
+
+;;; The msgpack package was split into msgpack-c and msgpack-cxx starting from
+;;; version 4.0.0.
(define-public msgpack
+ (deprecated-package "msgpack" msgpack-c))
+
+(define-public msgpack-3
(package
+ (inherit msgpack-c)
(name "msgpack")
(version "3.3.0")
(source
@@ -237,23 +290,13 @@ (define-public msgpack
'(let ((p (open-file "msgpack.pc.in" "a")))
(display
(string-append "Requires: " "zlib" "\n") p)
- (close-output-port p)
- #t))
+ (close-output-port p)))
(sha256
(base32 "0yzhq50ijvwrfkr97knhvn54lj3f4hr3zy39yq8wpf6xll94s4bf"))))
- (build-system cmake-build-system)
- (native-inputs
- (list googletest-1.8 pkg-config))
- (propagated-inputs
- (list zlib)) ;; Msgpack installs two headers (zbuffer.h,
- ;; zbuffer.hpp) which #include <zlib.h>. However, 'guix gc --references'
- ;; does not detect a store reference to zlib since these headers are not
- ;; compiled.
- (home-page "https://www.msgpack.org")
- (synopsis "Binary serialization library")
+ (native-inputs (list googletest-1.8))
(description "Msgpack is a library for C/C++ that implements binary
-serialization.")
- (license license:boost1.0)))
+serialization. This is the legacy version that predates the split into C and
+C++ specific packages.")))
(define-public libmpack
(package
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 5fc72d7937..44641360ba 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1172,10 +1172,8 @@ (define-public tmate
(base32
"0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi"))))
(build-system gnu-build-system)
- (inputs
- (list libevent libssh msgpack ncurses))
- (native-inputs
- (list autoconf automake pkg-config))
+ (inputs (list libevent libssh msgpack-3 ncurses))
+ (native-inputs (list autoconf automake pkg-config))
(home-page "https://tmate.io/")
(synopsis "Terminal sharing application")
(description "tmate is a terminal sharing application that allows you to
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d58b022123..16f73e355f 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -814,10 +814,8 @@ (define-public eovim
(string-append start nvim))))))
(add-before 'build 'set-home
(lambda _ (setenv "HOME" "/tmp"))))))
- (native-inputs
- (list pkg-config))
- (inputs
- (list efl msgpack neovim))
+ (native-inputs (list pkg-config))
+ (inputs (list efl msgpack-3 neovim))
(home-page "https://github.com/jeanguyomarch/eovim/")
(synopsis "EFL GUI for Neovim")
(description "Graphical Neovim interface based on the @acronym{EFL, Enlightenment
--
2.41.0
next prev parent reply other threads:[~2023-08-18 18:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-18 17:59 [bug#65371] [PATCH 00/10] [telephony-team] Update Jami and related packages Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 02/10] gnu: mmtf-cpp: Update to 1.1.0 Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 03/10] gnu: avogadrolibs: Remove msgpack from native-inputs Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 04/10] gnu: python-pymol: " Maxim Cournoyer
2023-08-19 9:53 ` Andreas Enge
2023-08-21 15:03 ` Maxim Cournoyer
2023-08-18 18:12 ` Maxim Cournoyer [this message]
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 06/10] gnu: Add sdbus-cpp Maxim Cournoyer
2023-08-18 18:53 ` Liliana Marie Prikler
2023-08-21 14:57 ` Maxim Cournoyer
2024-01-10 3:37 ` bug#65371: " Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 07/10] gnu: libnatpmp: Use gexps and simplify Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 08/10] gnu: libnatpmp: Update home page Maxim Cournoyer
2023-08-18 18:13 ` [bug#65371] [PATCH telephony-team 09/10] gnu: libnatpmp: Install missing natpmp_declspec.h header Maxim Cournoyer
2023-08-18 18:13 ` [bug#65371] [PATCH telephony-team 10/10] gnu: jami: Update to 20230619.1 Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c03c2aa247e94c24385a2765cc5b6c6352d9696b.1692382380.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=65371@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).