[PATCH] Added avro-cpp v1.11

  • Done
  • quality assurance status badge
Details
2 participants
  • Greg Hogan
  • Lenoci, L. (Leonardo)
Owner
unassigned
Submitted by
Lenoci, L. (Leonardo)
Severity
normal

Debbugs page

L
L
Lenoci, L. (Leonardo) wrote on 29 Feb 2024 00:51
(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
6d242f721778b3d94d0f10564bd479131fa8325e.camel@science.leidenuniv.nl
gnu: avro-cpp: Added version 1.11
* gnu/packages/serialization.scm (avro-cpp-1.11): Added version 1.11
---
gnu/packages/serialization.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
Toggle diff (52 lines)
diff --git a/gnu/packages/serialization.scm
b/gnu/packages/serialization.scm
index 331fae80cf..194a962d38 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2024 Leonardo Lenoci <l.lenoci@science.leidenuniv.nl>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -102,6 +103,32 @@ (define-public avro-cpp-1.9
implement RPC protocols.")
(license license:asl2.0)))
+(define-public avro-cpp-1.11
+ (package
+ (inherit avro-cpp-1.9)
+ (version "1.11.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://archive.apache.org/dist/avro/avro-"
version
+ "/avro-src-" version ".tar.gz"))
+ (sha256
+ (base32
"0d60vi4s8la0c64zfyydfy21690yf0px5bcsi5d1p8b06al8g9vf"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "lang/c++")))
+ ;;; avoid that deprecation warnings with boost v.1.80.0
+ ;;; are treated as errors
+ (add-after 'chdir 'unset-Werror
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("-Werror") ""))))
+ )))
+ ))
+
(define-public avro-cpp-1.9-for-irods
(package
(inherit avro-cpp-1.9)
base-commit: 8c0282cf543fe205a5b89201cd7bb8889121a07c
--
2.34.1
G
G
Greg Hogan wrote on 23 Apr 10:43 -0700
(name . Lenoci, L. (Leonardo))(address . l.lenoci@science.leidenuniv.nl)(address . 69472@debbugs.gnu.org)
CA+3U0ZksgBuzg1t1OqmOZnJ2+jgp=y+fPf2_0=mTM3oUr6R81A@mail.gmail.com
On Thu, Feb 29, 2024 at 9:46 AM Lenoci, L. (Leonardo) via Guix-patches
via <guix-patches@gnu.org> wrote:
Toggle quote (61 lines)
>
> gnu: avro-cpp: Added version 1.11
>
> * gnu/packages/serialization.scm (avro-cpp-1.11): Added version 1.11
> ---
> gnu/packages/serialization.scm | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/gnu/packages/serialization.scm
> b/gnu/packages/serialization.scm
> index 331fae80cf..194a962d38 100644
> --- a/gnu/packages/serialization.scm
> +++ b/gnu/packages/serialization.scm
> @@ -19,6 +19,7 @@
> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
> ;;; Copyright © 2024 Paul A. Patience <paul@apatience.com>
> ;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
> +;;; Copyright © 2024 Leonardo Lenoci <l.lenoci@science.leidenuniv.nl>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -102,6 +103,32 @@ (define-public avro-cpp-1.9
> implement RPC protocols.")
> (license license:asl2.0)))
>
> +(define-public avro-cpp-1.11
> + (package
> + (inherit avro-cpp-1.9)
> + (version "1.11.3")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append
> + "https://archive.apache.org/dist/avro/avro-"
> version
> + "/avro-src-" version ".tar.gz"))
> + (sha256
> + (base32
> "0d60vi4s8la0c64zfyydfy21690yf0px5bcsi5d1p8b06al8g9vf"))))
> + (build-system cmake-build-system)
> + (arguments
> + `(#:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack 'chdir
> + (lambda _ (chdir "lang/c++")))
> + ;;; avoid that deprecation warnings with boost v.1.80.0
> + ;;; are treated as errors
> + (add-after 'chdir 'unset-Werror
> + (lambda _
> + (substitute* "CMakeLists.txt"
> + (("-Werror") ""))))
> + )))
> + ))
> +
> (define-public avro-cpp-1.9-for-irods
> (package
> (inherit avro-cpp-1.9)
>
> base-commit: 8c0282cf543fe205a5b89201cd7bb8889121a07c
> --
> 2.34.1

Why not update the existing avro-cpp package and add the old version
and source fields to the inheriting avro-cpp-1.9-for-irods?
G
G
Greg Hogan wrote on 6 May 08:34 -0700
[PATCH] gnu: avro-cpp: Update to 1.12.0.
(address . 69472@debbugs.gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
0888b883a1d4f0a28e7b097cc59c6b4baabb1595.1746545596.git.code@greghogan.com
* gnu/packages/serialization.scm (avro-cpp-1.9): Rename to avro-cpp.
(avro-cpp): Update to 1.12.0.
[source]<uri>: Use Apache mirror.
[arguments]<#:phases>: Add phase to use system fmt.
[inputs]: Add fmt.
(avro-cpp-1.9-for-irods): Inherit from avro-cpp.

Change-Id: Iee70378ad5452ad51757aadb8f6adaf00fc5bab5
---
gnu/packages/serialization.scm | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)

Toggle diff (70 lines)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index c0f7001fa05..db8e85f411b 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -70,28 +70,34 @@ (define-module (gnu packages serialization)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages pretty-print)
#:use-module (gnu packages qt)
#:use-module (gnu packages time))
-(define-public avro-cpp-1.9
+(define-public avro-cpp
(package
(name "avro-cpp")
- (version "1.9.2")
+ (version "1.12.0")
(source (origin
(method url-fetch)
(uri (string-append
- "https://archive.apache.org/dist/avro/avro-" version
+ "mirror://apache/avro/avro-" version
"/avro-src-" version ".tar.gz"))
(sha256
- (base32 "0i3fpm7r72yw397qc8yw9ybzk2mxjkv0yk5hnn00ylc1wbd0np73"))))
+ (base32 "0ywg7s7m7ngiddcg78hwb34c49yjzal6glcckinvcik2fr9nmg88"))))
(build-system cmake-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda _ (chdir "lang/c++"))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "lang/c++")))
+ (add-after 'chdir 'fix-dependencies
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("^FetchContent_MakeAvailable\\(fmt\\)")
+ "find_package(fmt REQUIRED)")))))))
(inputs
- (list boost snappy))
+ (list boost fmt snappy))
(home-page "https://avro.apache.org/")
(synopsis "Data serialization system")
(description "Apache Avro is a data serialization system. Avro provides:
@@ -109,8 +115,16 @@ (define-public avro-cpp-1.9
(define-public avro-cpp-1.9-for-irods
(package
- (inherit avro-cpp-1.9)
+ (inherit avro-cpp)
(properties `((hidden? . #true)))
+ (version "1.9.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://archive.apache.org/dist/avro/avro-" version
+ "/avro-src-" version ".tar.gz"))
+ (sha256
+ (base32 "0i3fpm7r72yw397qc8yw9ybzk2mxjkv0yk5hnn00ylc1wbd0np73"))))
(arguments
`(#:configure-flags
'("-DCMAKE_CXX_COMPILER=clang++"

base-commit: fa39695bbc0c5f79838cbca55d55eebd821a8efa
--
2.49.0
G
G
Greg Hogan wrote on 13 May 10:29 -0700
(address . 69472-done@debbugs.gnu.org)
CA+3U0Zkp7pDLVVj=zHAXWFACMDivrJDc=Z05A9caLy0WMWG46Q@mail.gmail.com
On Tue, May 6, 2025 at 11:35 AM Greg Hogan <code@greghogan.com> wrote:
Toggle quote (84 lines)
>
> * gnu/packages/serialization.scm (avro-cpp-1.9): Rename to avro-cpp.
> (avro-cpp): Update to 1.12.0.
> [source]<uri>: Use Apache mirror.
> [arguments]<#:phases>: Add phase to use system fmt.
> [inputs]: Add fmt.
> (avro-cpp-1.9-for-irods): Inherit from avro-cpp.
>
> Change-Id: Iee70378ad5452ad51757aadb8f6adaf00fc5bab5
> ---
> gnu/packages/serialization.scm | 34 ++++++++++++++++++++++++----------
> 1 file changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
> index c0f7001fa05..db8e85f411b 100644
> --- a/gnu/packages/serialization.scm
> +++ b/gnu/packages/serialization.scm
> @@ -70,28 +70,34 @@ (define-module (gnu packages serialization)
> #:use-module (gnu packages python-check)
> #:use-module (gnu packages python-science)
> #:use-module (gnu packages python-xyz)
> + #:use-module (gnu packages pretty-print)
> #:use-module (gnu packages qt)
> #:use-module (gnu packages time))
>
> -(define-public avro-cpp-1.9
> +(define-public avro-cpp
> (package
> (name "avro-cpp")
> - (version "1.9.2")
> + (version "1.12.0")
> (source (origin
> (method url-fetch)
> (uri (string-append
> - "https://archive.apache.org/dist/avro/avro-" version
> + "mirror://apache/avro/avro-" version
> "/avro-src-" version ".tar.gz"))
> (sha256
> - (base32 "0i3fpm7r72yw397qc8yw9ybzk2mxjkv0yk5hnn00ylc1wbd0np73"))))
> + (base32 "0ywg7s7m7ngiddcg78hwb34c49yjzal6glcckinvcik2fr9nmg88"))))
> (build-system cmake-build-system)
> (arguments
> - `(#:phases
> - (modify-phases %standard-phases
> - (add-after 'unpack 'chdir
> - (lambda _ (chdir "lang/c++"))))))
> + (list #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'chdir
> + (lambda _ (chdir "lang/c++")))
> + (add-after 'chdir 'fix-dependencies
> + (lambda _
> + (substitute* "CMakeLists.txt"
> + (("^FetchContent_MakeAvailable\\(fmt\\)")
> + "find_package(fmt REQUIRED)")))))))
> (inputs
> - (list boost snappy))
> + (list boost fmt snappy))
> (home-page "https://avro.apache.org/")
> (synopsis "Data serialization system")
> (description "Apache Avro is a data serialization system. Avro provides:
> @@ -109,8 +115,16 @@ (define-public avro-cpp-1.9
>
> (define-public avro-cpp-1.9-for-irods
> (package
> - (inherit avro-cpp-1.9)
> + (inherit avro-cpp)
> (properties `((hidden? . #true)))
> + (version "1.9.2")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append
> + "https://archive.apache.org/dist/avro/avro-" version
> + "/avro-src-" version ".tar.gz"))
> + (sha256
> + (base32 "0i3fpm7r72yw397qc8yw9ybzk2mxjkv0yk5hnn00ylc1wbd0np73"))))
> (arguments
> `(#:configure-flags
> '("-DCMAKE_CXX_COMPILER=clang++"
>
> base-commit: fa39695bbc0c5f79838cbca55d55eebd821a8efa
> --
> 2.49.0

Pushed as 11cd06a4f7cad2c9c6b827ba6c06909ac20fea0f. I also switched
avro-cpp-1.9-for-irods to use the apache mirror, which does not affect
the derivation.
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 69472@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 69472
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch